revert formType changes to form class and use current form data from from Container instead