This reverts commit 012dc07c.

Revert "Partially revert r208574 to get the CQ working again (hopefully)."

This reverts commit 74105cd2.

Pull the --no-commit change out completely.

TBR=dpranke@chromium.org
BUG=254556

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

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