Followup to r64197