This reverts commit 6ccc7720, reversing changes made to f5acd0c1. I accidentally merged !55 before we had merged changes to the gitlab project that it depends on