Restoring Email

Just rolling back email change as it did not do anything.