Follow up to r77883