Submit Credit Card Contribution doesn't record payment instrument ID in transaction

When using the submit credit card contribution button to charge a credit card the resulting transaction has "null" for payment_instrument_id even if the contribution does have one.

Not sure what the best place to fix this will be.
Maybe in _ipn_process_transaction() we need
$input['payment_instrument_id'] = $contribution->payment_instrument_id;