Duplicate Billing address when using Separate Membership Payment option

When using the 'Separate Membership Payment' option for a Contribution page with Credit Card payment, the Billing Address is unnecessarily written to the civicrm_address table twice. I can't conceive of any scenario where the two contribution records should have different billing addresses, so both contribution records could point to a single address id.