Revert "Fix - fields in groups which are arrays get broken. We should trim not reset"

This reverts commit ae929c2e82c177690db8feab45ee7ada6660f6b1.