Revert some unnecessary changes in handling XML read

Change-Id: I3bbbc3159930d80e2e1f28fa9c0035ae5029d4b8
2 files changed