This reverts commit 3f0dacf0.

Reason for revert:
Is causing staged changes to be reverted.

BUG=607913
TBR=hinoka,dnj

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

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