Revert of https://codereview.chromium.org/115973007/
Reason for revert: Triggered Valgrind errors again.

TBR=asargent@chromium.org,tbarzic@chromium.org,stephenlin@chromium.org,nickam@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=328246

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

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