Reverting previous change to attempt to fix #65016

What does this MR do?

Attempt at Fixing #65016 (closed)

Does this MR meet the acceptance criteria?

Conformity

• Changelog entry for user-facing changes, or community contribution. Check the link for other scenarios.
• Documentation created/updated or follow-up review issue created
• Code review guidelines
• Merge request performance guidelines
• Style guides
• Database guides
• Separation of EE specific content

Performance and testing

No risks in the change.

Security

No security risks in this change.