revert to fix no sending email issue

alan_blakerequested to merge
issue/gmail-3464685:3464685-no-emails-arrive into 1.0.x

Closes #3464685

Merge request reports