HCOLL-230 - reverted back to previouse version