[CLC-1709] Revert modified sorting

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1709