Reverted fix https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/15788

See merge request gitlab-org/gitlab-ce!16118