GitLab

Temporary revert to help out Brillo folks.
It will be resubmitted tomorrow.

This reverts commit 4495f6af.

Change-Id: Id378c7d3a6e72e9be50f9404b19d5763568987a5