revisiting customer with saved CC data causes additional "invalid" payment

[cshapeshifter]

We're using 3.0-stable and have two payment options: credit card through braintree and check. When a user orders something for the first time and enters their credit card info, everything works fine. The order is processed and its payments show up as follows. All is good.

However, when the customer returns, they will find the following choice (use saved card or choose new payment method) in the front-end:

No matter what they pick (whether they pay with the same card, a new card, or using a different method, i.e. check), the process again finishes without errors, but in the backend, the order's payments look like this:

These "invalid" payments can't even be deleted. Trying to flashes an error "Braintree::NotFoundError"

Gems in use:

gem 'spree', github: 'spree/spree', branch: '3-0-stable'
gem 'spree_gateway', github: 'spree/spree_gateway', branch: '3-0-stable'
gem 'braintree'
gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '3-0-stable'

gem 'spree_i18n', github: 'spree-contrib/spree_i18n', branch: '3-0-stable'
gem 'spree_mail_settings', github: 'spree-contrib/spree_mail_settings', branch: '3-0-stable'
gem "spree_product_zoom", :git => "git://github.com/spree/spree_product_zoom.git", branch: '3-0-stable'
gem 'spree_static_content', github: 'spree-contrib/spree_static_content', branch: '3-0-stable'
gem 'spree_print_invoice', github: 'spree-contrib/spree_print_invoice', branch: '3-0-stable'

[mobentec]

This is happening with me too. Is there a solution/fix for this?