This fix uses logic that exists in the OrganizationContactsResource ~L60, and formats it to look like the previous data. There should be work later to convert calls to use smaller payloads when possible to make responses and caches lighter, but isn't necessary for this fix.