CE counterpart: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/16672/diffs Issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/21554#note_54521107