Follow-up r81660.