GitLab

This reverts commits 3d8ae2fd and
e3168df0.

Reason for revert: e3168df0 broke the Linux CFI bot due to a misplaced
blacklist entry and 3d8ae2fd was a follow-up change.

Change-Id: I13f8db49d0621cb8e588ae26d261e362faa462a9
Reviewed-on: https://chromium-review.googlesource.com/724921Reviewed-by: Peter Collingbourne <pcc@chromium.org>
Commit-Queue: Peter Collingbourne <pcc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#509702}