Move stripping of xmlns="jabber:client" much further up the chain

See diff :)