Revert of https://codereview.chromium.org/80403002/
Reason for revert: Breaks Aura

TBR=jln@chromium.org,aedla@chromium.org
NOTREECHECKS=true
NOTRY=true

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

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