Revert "Fixes for currency conversion issues from develop branch"

This reverts commit 500f50ca42295a0e3772290a311ab82244fd4485 which broke currency conversion for certain FX Forward calculations between 2.1.4 and 2.1.5.