Revert "Merge branch 'revert-92a25640' into 'master'"
This reverts merge request !267 (merged), which itself reverts !265 (merged)
We should merge this after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/19717 is merged.
Sorry for the runaround @nolith @jacobvosmaer-gitlab . Let's revisit this once gitlab-ce support has been merged.