Reverted json/xml formatting to initial state before issue 278 as per request by Tom