Partial revert of r169693

That CL caused a bunch of crashes (see referenced bug). This CL contains a
manual partial revert of that CL, which will hopefully fix the crashes.

TBR=eseidel@chromium.org
BUG=355262

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

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