This reverts commit 0bccf3e6.

R=ulan@chromium.org

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