HCOLL 5 Previous commit accidentally reverted some changes; fixed.