Bug 23049: Update existing code to use debit_type