Made the sorter be the one that works (now that we have a unit test I can tell).