Revert of https://codereview.chromium.org/108413005/
Reason for revert: Reverting the revert.  Original patch was not to blame after all.

TBR=yurys@chromium.org,aandrey@chromium.org
NOTREECHECKS=true
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/blink/trunk@163789 bbb929c8-8fbe-4397-9dbb-9b2b20218538