Revert "Grid sorts by displayName as per user pref"

This reverts commit 18a9d1f20ca11918e2eea2f312a9ce5dd5904d75.