This reverts commit 2f2b0593.

Sample breakage:

http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/67372/steps/gclient%20sync/logs/stdio

BUG=
R=grt@chromium.org, hinoka@chromium.org

Review URL: https://codereview.chromium.org/267393007

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@268887 0039d316-1c4b-4281-b951-d872f2087c98