Revert r223347 which has caused crashes on bootstrap bots.