Followup to r66873