diff --git a/ChangeLog b/ChangeLog
index 97a1cab281..07e9203194 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue May 27 19:45:20 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* numeric.c (flo_divmod): Revert the behavior change; do not
+	  suppress an exception when div is NaN or Inf. [ruby-dev:34857]
+
 Tue May 27 19:24:40 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* enum.c (enum_to_a): Pass arguments through to #each().
diff --git a/numeric.c b/numeric.c
index c6ef250a6e..b2f2e1fad9 100644
--- a/numeric.c
+++ b/numeric.c
@@ -761,9 +761,6 @@ flo_divmod(x, y)
         val = round(div);
 	a = LONG2FIX(val);
     }
-    else if (isnan(div) || isinf(div)) {
-	a = rb_float_new(div);
-    }
     else {
 	a = rb_dbl2big(div);
     }