daea7e69ca
This reverts commit 16e577741d.
TBR=johnmccutchan@google.com,
BUG=
Review URL: https://codereview.chromium.org/2162113002 .