Contribution Type of pledge is not honored for self-service pledge payment

To reproduce this issue:

1) In the staff area, create a new pledge for a contact. Set the contribution type for this pledge as "building fund" Also set a self-service payment page for this pledge.

2) Log in to Drupal as that contact and go to their contact dashboard. ( ie URL http://demo.mygroup.org/civicrm/user?reset=1&id=14)

3) Click the "make payment" link for the open pledge.

4) Go back to the staff area, and review the contribution details. It does NOT have the contribution type of "building fund" Instead it has whatever was configured for the contribution page that was chosen for self-service in step 1.

If a staff member records the pledge payment in the back end, then the correct contribution type of "building fund" is honored.

It seems the only possible work-around is to create a self-service payment page for every possible contribution type. This is not realistic in any situation where there are over 60 contribution types. ( The current environment I am working with has over 300 contribution types. )