Revert "Merge branch '214627-fix-incorrect-csv-export' into 'master'"

What does this MR do?

This reverts !36556 (merged) as it's introduction caused the most recent broken master

Screenshots

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