Don't pass jid in non-full return per #4402