2.5 update breaks multi-button forms

I have contact forms that have multiple submit buttons with different settings for each button. By moving PayPal submit options to a tab, this update has broken sites that use multiple buttons for different options on the same form. I have reverted to a previous version for now, but this is only a temporary solution until PayPal decides to stop supporting the submission method used by version 2.4.

Can you please put short-tag support back into future versions and only use the settings in the PayPal tab as defaults if no short-code tags are used?

Thanks.