I reverted the commits that changed the validation stuff and it seems to work fine.