Minor followup to r70480