fix billingtest build
backing out billingrestore as upstream is trying to fix