GitLab

This reverts commit ee89f219.

This reapplies commit
1bd16b67
for the third time.

Change-Id: I3be72f643f5ddce87dfc39d98f19e395525554d8