Revert "Fix unsorted maps ids"

This reverts commit 94eaa2ca60fa1ba5554827c54e2b8f6f5ebb213c.