Revert earlier version suppression and add except clause around sort