4aadfe09df
Reason: broke VM bots, still investigating.
This reverts commit 610d081947.
TBR= paulberry@google.com
Review-Url: https://codereview.chromium.org/2979463002 .