Revert "Use numeroc value instead of formula"

This reverts commit 5b78faab1196f7f7557e6381adc892869c5aaefc.