ea3526344a
This reverts commit 20066b625a.
TBR=asiva@google.com
Review-Url: https://codereview.chromium.org/3011563002 .