Follow up to r70313