Follow up r24808.