follow-up to r53282: