GitLab

This reverts commit eaa28762.

The workaround is not needed any more.

Change-Id: I2fe42548af399bac943dddf5207987c980cf8f7e