Revert "Switch from FloatMath to Math, better performance and"

This reverts commit f797ab7547f509963b2e54a3cbcd53aab744868f.