Committed a tentative fix to branch [smtp-init-tkt-d9be31a488].

This is commit [9c0c77acf0].

Please get this branch or commit and check if that fixes the problem you have with the command.