Revert "Working around #23 and #24 in mboxing plugin"

This reverts commit f603caf9eb9543154d56135f6b2c077c0d606a39.
Revert "Working around #21 in mboxing plugin"

This reverts commit c6fdad293b834c37a2e70479fd09bf27c8806343.