Switch to just using the straight JID