Merge branch 'revert-81548e57' into 'master'

Revert "Merge branch '498877-rm-fk' into 'master'"

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



Merged-by: Mayra Cabrera <mcabrera@gitlab.com>
Approved-by: Mayra Cabrera <mcabrera@gitlab.com>
Co-authored-by: Marius Bobin <mbobin@gitlab.com>