Revert of https://codereview.chromium.org/78603003/
Reason for revert: broke win again :/

TBR=jochen@chromium.org
NOTREECHECKS=true
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237562 0039d316-1c4b-4281-b951-d872f2087c98
SVN changes up to revision 237562