Something here is messed up Revert "message bus fixes and diagnostics"

This reverts commit 36d1aafe1eddf0f483cc77ec4e9217237fdd6d08.