HCOLL-110 remove unnecessary atomicity