Further followup to r70460/r70461 and r70477