diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 9add722014e..9830cca2ef5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2011-09-25  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	Revert (no longer necessary post r179130):
+
+	2010-04-27  Fabien Chêne  <fabien.chene@gmail.com>
+
+	* testsuite/util/testsuite_error.h: Add empty default constructor
+	to __gnu_test::test_category and
+	__gnu_test::test_derived_category.
+	* src/future.cc: Add empty default constructor to
+	future_error_category.
+	* src/system_error.cc: Add default ctor to generic_error_category
+	and system_error_category.
+
 2011-09-24  John Salmon  <john.salmon@deshaw.com>
 
 	PR libstdc++/50510
diff --git a/libstdc++-v3/src/future.cc b/libstdc++-v3/src/future.cc
index 94ae6f170d5..8569bf0af3b 100644
--- a/libstdc++-v3/src/future.cc
+++ b/libstdc++-v3/src/future.cc
@@ -28,8 +28,6 @@ namespace
 {
   struct future_error_category : public std::error_category
   {
-    future_error_category() noexcept {}
-
     virtual const char*
     name() const noexcept
     { return "future"; }
diff --git a/libstdc++-v3/src/system_error.cc b/libstdc++-v3/src/system_error.cc
index 818619942e4..3ee1d9b0b0a 100644
--- a/libstdc++-v3/src/system_error.cc
+++ b/libstdc++-v3/src/system_error.cc
@@ -34,8 +34,6 @@ namespace
   
   struct generic_error_category : public std::error_category
   {
-    generic_error_category() {}
-
     virtual const char*
     name() const noexcept
     { return "generic"; }
@@ -51,8 +49,6 @@ namespace
 
   struct system_error_category : public std::error_category
   {
-    system_error_category() {}
-
     virtual const char*
     name() const noexcept
     { return "system"; }
diff --git a/libstdc++-v3/testsuite/util/testsuite_error.h b/libstdc++-v3/testsuite/util/testsuite_error.h
index bb9ddd7cdea..69a90fbecfc 100644
--- a/libstdc++-v3/testsuite/util/testsuite_error.h
+++ b/libstdc++-v3/testsuite/util/testsuite_error.h
@@ -29,8 +29,6 @@ namespace __gnu_test
 {
   struct test_category : public std::error_category
   { 
-    test_category() {}
-
     virtual const char*
     name() const noexcept
     {
@@ -45,8 +43,6 @@ namespace __gnu_test
 
   struct test_derived_category : public test_category
   { 
-    test_derived_category() {}
-
     virtual const char*
     name() const noexcept
     {