Revert "MsgEngine: More work on improving maintainability."
This reverts commit 6c2f9046916ed0efcc6b40c07e6bd2b916959769.
Revert "MsgEngine: More work on improving maintainability."
This reverts commit 6c2f9046916ed0efcc6b40c07e6bd2b916959769.