Switch back to old sorting system