Removed dependency on jid, which is not in the base system.