Revert "Avoid using float, fix #1741"

This reverts commit 0051bcf66e10562f3a832d598fa0b6e1d356c35f.