Reverting https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22526 in light of https://gitlab.com/gitlab-org/gitlab-ce/issues/53660.