[CLC-1709] Revert modified sorting
Merge pull request #977 from yuhunglin/CLC-1709

[CLC-1709] Revert modified sorting