GitLab

This reverts these three changes - the original one, plus two fixes that landed on top of it.
It's too late to try to fix bug 393665. Let's revert, merge the revert to M40, then try again
when we have a proper fix for bug 393665.

4f8a4bca #301810 https://codereview.chromium.org/387353004
ffd2bdde #307160 https://codereview.chromium.org/771353004
5a1a4d91 #307167 https://codereview.chromium.org/784553002

BUG=437701,393665
TBR=ananta

Review URL: https://codereview.chromium.org/796333009

Cr-Commit-Position: refs/heads/master@{#309549}