Revert r189649 because it was breaking sanitizer bots.