Revert "XML Changes"

This reverts commit a51a69889e8d9cb46b48d21a9f748b911fe9bafc.