Removing bypassBilling again....