This reverts commit 31388627.

BUG=chromium:630629

Review-Url: https://codereview.chromium.org/2171373002
Cr-Commit-Position: refs/heads/master@{#37986}