Revert r255454 as it leads to several test failers on buildbots.