Followup to r86312