Affiliate upsell tracking with sub ID

When sub IDs are used for tracking affiliate purchases, it only works with the main purchase. They don't work with upsells - the upsell purchases are added to the "no sub ID" section. So we don't really know where these upsell purchases came from. Can we make sub IDs work for upsells as well?

(ticket #684740)

Thank you