Revert "Tracking default order should now be correct"

This reverts commit 7476ae2a82755a86c77a7ea1d912eff79d027316.