Revert "rethink formbuilder"

This reverts commit ca4eaa42883590ce6c87589cac54e9e725b54177.