Client side now expects standard envelope.