Revert "Revert r161710 and r161714"

This reverts commit 91222f61bb68edbb8ace030aa4a29f78e3b49538.
The revert at r161710 targetted wrong revision. Cancelling it.

BUG=305497
TBR=abarth

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

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