Revert changes for Automated Email fix.