Follow-up to r50869: