Temporarily revert changes from r11025, r11029, r11035 & r11036 for better combined changeset for PayPal module update