Roll back some of the messageListHelper.init changes