GitLab

This is the revert of crrev.com/b77864ad
Turns out that fix causes crbug.com/775526.
In the mean time, revert won't re-trigger the crbug.com/759007 as it's
fixed by crrev.com/9990e87e.

Bug: 759007
Bug: 775526
Change-Id: I2cd5acefb3d8588613629a99dde592f648650a93
Reviewed-on: https://chromium-review.googlesource.com/757718Reviewed-by: anthonyvd <anthonyvd@chromium.org>
Commit-Queue: Owen Min <zmin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#515211}