Merge branch 'remove-15-11-fix' into 'master'

Remove old 15_11 fix

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/165360



Merged-by: Pam Artiaga <partiaga@gitlab.com>
Approved-by: Roy Liu <rliu@gitlab.com>
Approved-by: John Mason <9717668-johnmason@users.noreply.gitlab.com>
Approved-by: Tiger Watson <twatson@gitlab.com>
Approved-by: Pam Artiaga <partiaga@gitlab.com>
Co-authored-by: Jon Jenkins <jjenkins@gitlab.com>