Revert "MOTM-867: Fixed sorting as suggested in ticket"

This reverts commit b4ec7023c4c987cd643b829a18a8356dbc3bd33f.