Revert r222091 because it caused a buildbot failure.