Bug 4614 - Reintroduce xid check for correct RPC handling