For fixing email, revert it

This reverts commit 476c0b937ec0d05286b1b20839bc2ebb57c98829.
Email fixed.

This reverts commit f6cca7ccbaeaff52348cd1afd9d520459a15511b.