HCOLL-202 fixed

This reverts commit 9c5cc526515b70c0faf09c5dfcb5adc6e2b5af32.