Merge "Revert "Use FloatMath instead of Math.""