Reverted change to ConcurrentHashMap due to performance issues with
larger Java heap sizes.