Rollback for issue #12274 given that it does not consider email domain names with hyphens valid after the first component of the domain name.
