diff --git a/ChangeLog b/ChangeLog
index 9d7bf4ca0c..07475885f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Wed Oct 29 23:24:38 2008  Yusuke Endoh  <mame@tsg.ne.jp>
-
-	* array.c (rb_ary_sort_bang): replacing array during sort broke
-	  invariant of array.
-
 Wed Oct 29 20:45:08 2008  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* test/webrick/utils.rb (start_server): provide a reference to log of
diff --git a/array.c b/array.c
index dcf8d0e56c..e04de09cc2 100644
--- a/array.c
+++ b/array.c
@@ -1751,18 +1751,14 @@ rb_ary_sort_bang(VALUE ary)
 	ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
 		   rb_block_given_p()?sort_1:sort_2, &data);
 
-        if (ARY_EMBED_P(tmp)) {
+        if (ARY_EMBED_P(ary) || ARY_EMBED_P(tmp)) {
             assert(ARY_EMBED_P(tmp));
-            if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
-	        rb_ary_unshared(ary);
-	        FL_SET_EMBED(ary);
-            }
             MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp));
             ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
         }
         else {
+            assert(!ARY_EMBED_P(ary));
             assert(!ARY_EMBED_P(tmp));
-            if (ARY_EMBED_P(ary)) FL_UNSET_EMBED(ary);
             if (RARRAY_PTR(ary) != RARRAY_PTR(tmp)) {
                 assert(!ARY_SHARED_P(tmp));
                 if (ARY_SHARED_P(ary)) {