Revert !57372 to fix a broken master [RUN ALL RSPEC] [RUN AS-IF-FOSS]

What does this MR do?

Reverts !57372 (merged) to fix #326547 (closed)

Does this MR meet the acceptance criteria?

Conformity

• 📋 Does this MR need a changelog?
  • [-] I have included a changelog entry.
  • [-] I have not included a changelog entry because _____.
• [-] Documentation (if required)
• Code review guidelines
• Merge request performance guidelines
• Style guides
• [-] Database guides
• [-] Separation of EE specific content