Revert "Custom email validation won't be needed after all."

This reverts commit 2c328f195a9179f11011afade8c79a39c8426ff1.