Revert part of the XML change, allow Contacts/Addresses to be used by Orgs
(more to come)