GitLab

Replacing a workaround with a less hacky solution.

Bug: 1122212,1012436,1121577
Change-Id: I7d3cb641a695d4c8f4a70b982316f38957941cc0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2386344Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Patrick Noland <pnoland@chromium.org>
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#804444}