GitLab

This is a partial revert of
https://chromium-review.googlesource.com/c/chromium/src/+/1702769

TBR=estade@chromium.org

Bug: 988055
Change-Id: Id6e67a5a69fa97c23083f44b9054526792cb58ff
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1750790Reviewed-by: Gayane Petrosyan <gayane@chromium.org>
Commit-Queue: Gayane Petrosyan <gayane@chromium.org>
Cr-Commit-Position: refs/heads/master@{#686339}