SPR-11875: Revert SPR-8956

This reverts commit e1d11ec99d40051ecdb60191c49bc587373a031d.
SPR-11875: Fix SPR-8956 using ConcurrentReferenceHashMap