Revert "Merge branch 'dm-drop-default-scope-on-sortable-finders' into 'master'"

Closes #34511

See merge request !12557