This reverts commit 8581e152.

This creates really difficult conflicts with another MR that was
worked on simulataneously. That MR mostly encompassed the aims of
this commit.

See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5308/commits