Important changes when Mage_GoogleCheckout is disabled