This reverts commit 0b424ca5d2 R=ahe@google.com Review-Url: https://codereview.chromium.org/2919003003 .
0b424ca5d2