Revert "Initial XML changes to force into 1.6.2."

This reverts commit 4ca88477180db237be2b8c1f3ad0a892b4a0b33a.