Revert "* Restoring of sort indices"

This reverts commit 730fa4cbb7f2fbee0ea54b4085224fa364247b37.

Improved?