Revert r164663 due to buildbot failure.