Revert of https://chromiumcodereview.appspot.com/106663009/
Reason for revert: Potentially fails the tests.

TBR=pwestin@google.com
NOTREECHECKS=true
NOTRY=true

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

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