Done in the bump to upstream GitLab 14.8, turned out not to be strictly necessary, still an improvement