Revert earlier changes to email address validation