The purpose of #18982 is to improve the SMTP mailer, but there were some unrelated changes made to the SMTP auth in d60c438694 This PR reverts these unrelated changes, fix #21744
d60c438694