878775607c
This reverts commit 7e560a612f.
R=brianwilkerson@google.com, paulberry@google.com, devoncarew@google.com
BUG=
Review-Url: https://codereview.chromium.org/2634603002 .