diff --git a/ChangeLog b/ChangeLog
index 8cc90b513b..a7064590a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Jul 22 07:15:33 2015  Koichi Sasada  <ko1@atdot.net>
+
+	* ext/objspace/objspace.c (total_i): no need to skip singleton classes.
+
 Wed Jul 22 06:37:54 2015  Koichi Sasada  <ko1@atdot.net>
 
 	* vm_core.h: constify rb_call_info_t::kw_arg,
diff --git a/ext/objspace/objspace.c b/ext/objspace/objspace.c
index 7d461831ac..352380d89b 100644
--- a/ext/objspace/objspace.c
+++ b/ext/objspace/objspace.c
@@ -61,9 +61,6 @@ total_i(void *vstart, void *vend, size_t stride, void *ptr)
 	      case T_NODE:
 	      case T_ZOMBIE:
 		continue;
-	      case T_CLASS:
-		if (FL_TEST(v, FL_SINGLETON))
-		  continue;
 	      default:
 		if (data->klass == 0 || rb_obj_is_kind_of(v, data->klass)) {
 		    data->total += rb_obj_memsize_of(v);