Revert "Rid ourselves of the _badmsg queue"

This reverts commit 2c152494487f7a212fca1f501291e050873e6738.