Merge "Revert "Use ConcurrentHashMap to make private maps thread safe"" into main