Picked up from @jacopo-beschi's https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/7454
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/19981