Revert "Change to reflect code change from map to unordered_map"

This reverts commit 3e6eb284090113fe0221a9e5976fed9534a476fe.
Change to reflect code change from map to unordered_map (reverse-merged from commit 3e6eb284090113fe0221a9e5976fed9534a476fe)