Extra fieldsets are created when calling form multiple two times

Yet another test to demonstrate regression since #5636

Ref to #6074 #6100
Removing changes in #5093 fixes this