Revert "Stripped out the recalculation"

This reverts commit 10ffb30c427977150e3cf28efd208c210576a039.