Followup to r54416