Get rid of the xml->txt workaround