Follow-up to r53286