Reverted to fast axis sorting