Mark pointed out that this is better. This was Ambrose's other patch, he
provided both since he wasn't sure which way it should have been sorted.
(it was not sorted consistently at all)