fix payment lookup when revoking batch payments, #18548 and #21117