1574 - Second half of the rollback to previous code to make primitivelistfields work.