PAYG instance erronenously counts toward multiple billing acount IDs when billing account ID is updated

When a PAYG instance is provisioned against a billingAccountId A, and then is updated to billingAccountB, the tallies continue to count it towards both A & B.