Making sure that we always use to message mapper to figure out the actual
message type. Closes #1713