This reverts some of the UX improvements made in
https://gitlab.com/gitlab-org/gitlab-ee/issues/5146#note_62837301, but until
this data is correct then let's use the previous version.

Closes #5827