Calculation is now done in CalculateAmount (cherry picked from commit 93eda20d5cf6eeb34e1aee1b81469ba6e8fa7f0c)