Revert of https://codereview.chromium.org/131573003/
Reason for revert: requires one more iteration

TBR=jam@chromium.org,aa@chromium.org,abarth@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=297480

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

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