Revert removal of ConcurrentReaderHashMap (in r2592 and r2596), will be placed on separate feature branch.
