Revert the xml/json removal commit on json_xml branch