cf7ff42e60
This reverts commit 2fed1c3905.
SDK builds are failing
TBR=zra@google.com
Review URL: https://codereview.chromium.org/2455593002 .