Revert !50312 into 'master'" [RUN AS-IF-FOSS]

What does this MR do?

Reverts !50312 (merged) to fix #296672 (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