Revert back to merge sort for geometry sorting.
Some issues have been reported, and are difficult to track as they happen randomly.