Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/33376 Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/33384