Revert Xmpp.JID to JID 2