Revert 180550 and 180573.

TBR=ziran.sun
BUG=395627

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

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