Follow up r85888