Adding in the change to the message event that was introduced in the other PR.