Revert part of r198115 to see if it fixes a buildbot failure.