This reverts commit 918ef9d7.

R=mstarzinger@chromium.org
BUG=

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

Cr-Commit-Position: refs/heads/master@{#25646}