backport cust_payby changes onto cust_main instead