HCOLL-248 changed default behaviour again