Revert "Changed from map to unordered_map"

This reverts commit a065ee7d6a96396c8d7bd5226ce9996a697b92ac.