This reverts commit b4d2f3eb.

Bug: chromium:651354, chromium:788113
Change-Id: I04b7541e7eb69f737d45e90bbfec591cf8f8190f
Reviewed-on: https://chromium-review.googlesource.com/800552Reviewed-by: Ulan Degenbaev <ulan@chromium.org>
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49765}