Turning off bypassBilling logic for now