This reverts commit 1f61ac50.

TBR=littledan@chromium.org
BUG=chromium:513160
LOG=N

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

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