Revert SmtpManager modification