Revert "Revert "xml""

This reverts commit 830eb2a7de21c184a96f3c81dd6c4fb333463083.