Revert "- Patched from trunk support for xid. - Two minor fixes, also from trunk."

This reverts commit d5c1bb1da6ffb2af34b66cd266a8698f20dc36b4

Change-Id: Ifc96bbc33f25f0769f90d21771025c23a6972043
7 files changed