Revert "Ensure can always sort on id"

This reverts commit 17ed24fda3d6c63c40960cb983c2795856ca5078.