Revert "Merge branch 'fix_15671' into 'master'"
This reverts merge request !811 (merged) because it has some side effects on Nancy and Lyon.
GitLab upgrade completed. Current version is 18.1.6 - https://about.gitlab.com/releases/2025/06/19/gitlab-18-1-released/
This reverts merge request !811 (merged) because it has some side effects on Nancy and Lyon.