Revert r61508: it caused test_mailbox to fail on all platforms.
2 files changed