Revert "Merge branch 'revert-git-merge-tree' into 'master'"

This reverts commit 2df9d7f6, reversing changes made to 75a15703.

Reverts MR: !5843 (merged) Failed Pipeline: https://gitlab.com/gitlab-org/gitlab/-/pipelines/880023151/