Revert "new xmpp"

This reverts commit 5c63f4cb354deff28b4207ae21bf64fb4abe8e65.