This reverts commit 09a2196b7a. This wasn't approved by the maintainer and may require more testing. @sunpoet: My apologies for not rebasing/rearranging the mailman commits.
09a2196b7a