Follow-up to r55990, per comments: