Follow-up r92528: