This change is a follow-up MR for this issue
Original MR is already merged.
Closes https://gitlab.com/gitlab-org/gitlab/-/issues/213286