MULE-7535 Best to be conservative and not attempt to make things consist...

...ent for now.