Remove FIXME #2699---I believe the calculation is correct. Fixes #2699.

r? @jld or @graydon

The calculation looks right to me, but perhaps one of you two can double check.  You two seem like you are doing the most recent work in this sort of area.