Revert "changed dependency of FormBuilderFactory"

This reverts commit f305c9d580cbf88f7716674411580e9178a950db.