Revert "EMAIL_DEFAULT_FROM_ADDRESS"

This reverts commit f6c7829b9fb2f537b61bf7e4cb830d445e366de1.