Revert some changes, all the forms were broken