This is another area that will need clean up - we really shouldn't mutate the message twice in the local transport.