FD-1154 Undid last ActiveMerchant change set to bring it back into line with what's deployed.