8c738c2dad
This reverts commit 878775607c.
R=brianwilkerson@google.com, paulberry@google.com
BUG=
Review-Url: https://codereview.chromium.org/2658273002 .