This reverts commit 5043ab26.

Tbr: ulan@chromium.org
Bug: chromium:923361
Change-Id: I3a2cf2c29fe4dc424def8dc086856ed3301f2fc2
Reviewed-on: https://chromium-review.googlesource.com/c/1425904Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#58992}