Reverting r241058 because it's causing buildbot failures.