The patched email Generator from rfc3156 is no longer necessary (and
in fact it no longer works), revert to using the Generator from Python
stdlib.

Verified manually with TB.