Revert setSort function in light of new approach