Follow-up r78101: