Revert of https://codereview.chromium.org/133123004/
Reason for revert: Broke compilation on a number of bots on the main waterfall

TBR=hashimoto@chromium.org,kinaba@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=324166

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

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