Revert "ConcurrentHashMap is junk - lets stick to standard unless issues arise."

This reverts commit 5d1a2c59a7ff9c1c1542256d453e3e307304ee37 and closes #304