Revert r152202 as it's causing internal buildbot failures.