Revert "Merge pull request #2508 from tomwys/patch-1"
Revert "Merge pull request #2508 from tomwys/patch-1"

This reverts commit c45607e9395ffd05c2cff454fdb55b3ab05dc0e3, reversing
changes made to 9769337ca855f4831c855d6663ff3f688ee1652d.

mbox/django,mbox/django,mbox/django