Revert some message changes