Issue 1307 by Derek Shockey, fox the same bug for RCPT. Neal: please backport!
Issue 1307 by Derek Shockey, fox the same bug for RCPT.
Neal: please backport!

sk-/python2.7-type-annotator,sk-/python2.7-type-annotator,sk-/python2.7-type-annotator