I backed them out, and the related change in xml_exporter. We'll see what happens with tests.