Revert "Improvements for ordering in custom exports"
Merge pull request #4205 from dimagi/revert-3841-86347-2

Revert "Improvements for ordering in custom exports"