Bug 21756: (follow-up) Replace newly introduced manualinvoice call