qRevert "Changes to Hazelcast code"

This reverts commit f378eb82151bf5f3920515f0b8de15b870166fdf.