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

This reverts commit b4ec7023c4c987cd643b829a18a8356dbc3bd33f.
Merge pull request #609 from m038/MOTM-874

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