Merge "Revert some unnecessary changes in handling XML read"