GitLab

This experiment has been adopted, we can simplify the code
by dropping the associated preprocessor conditionals.

Change-Id: I6ac62c2825eabcba8f854cfa25c84638d9a73872