revert changes in message lib