Follow up to r70140