This reverts commit 136ecbb9.

Bug: chromium:852420
Change-Id: I4fab9d6ed7b18085352fa7488c2849b90588deaf
Reviewed-on: https://chromium-review.googlesource.com/1189802
Commit-Queue: Hannes Payer <hpayer@chromium.org>
Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Reviewed-by: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#55467}