Revert "Merge branch '32737-make-mergeservice-idempotent' into 'master'"

What does this MR do?

Reverts !24708 (merged) as it's probably causing #213620 (closed)

Does this MR meet the acceptance criteria?

Conformity

• [-] Changelog entry
• [-] Documentation (if required)
• Code review guidelines
• [-] Merge request performance guidelines
• [-] Style guides
• [-] Database guides
• [-] Separation of EE specific content