Revert all the form validation changes

Will handle this with another PR