Revert last change by haoliu because of buildbot failure.