Revert 'Merge branch 'sort-names''

This reverts commit 8d6c5d068c9bb63ba67712d61ae7be49eae9d887
