Revert r179115 as it looks to have killed the ASan tests.