Re-land https://codereview.chromium.org/1072303004

      Changes of https://codereview.chromium.org/1072303004 are reverted by
https://codereview.chromium.org/1126133005/ unexpectedly.
So we need to re-land it to fix the original issue.

BUG=477260

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

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