Revert !49244

What does this MR do?

Revert !49244 (diffs) for time being, as it causes master:broken :(

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