Revert "Cleaned up XMLReader"

This reverts commit 9c9c7646e52b6d48c89b413d2a4c063177cadece.