Follow up to r114081;