Revert "XML change"

This reverts commit 2096c0128b77f1b3bbcb79ed628bc79855ad2765.