GitLab

This reverts commit 626a2468.

(cherry picked from commit aab0f86e)

Change-Id: I2333b54dcfd5ee8227a6479d2e3814b25377bdfd