GitLab

Some other classes are using this. Restore this until they can be
removed.

Change-Id: Ibf188b7c4915865e20cc4ca51c73f26314df7828