Revert "I'm assuming order of XML tags doesn't matter - this fixes failing unit test though"

This reverts commit 7290a9af17b8e2cc8dce40972139a8501cd730a5.
Revert "Sort"

This reverts commit fd84f441121d3fb4b6fc9b5e117828c8ad61850a.