diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 750362b40b9..b25d362f1ba 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,12 @@
+2011-10-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	Revert:
+        2011-10-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/50864
+	* pt.c (tsubst_copy_and_build): Fix qualified_name_lookup_error
+	call in case COMPONENT_REF.
+
 2011-10-28  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* pt.c (unify_pack_expansion): Initialize bad_old_arg and bad_new_arg.
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index beab46e6e6f..27d44e671ae 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2011-10-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	Revert:
+        2011-10-28  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/50864
+	* g++.dg/template/crash109.C: New.
+
 2011-10-28  Jason Merrill  <jason@redhat.com>
 
 	* c-c++-common/dfp/pr33466.c: Adjust for user-defined literals.
diff --git a/gcc/testsuite/g++.dg/template/crash109.C b/gcc/testsuite/g++.dg/template/crash109.C
deleted file mode 100644
index 3f2f81ee8bc..00000000000
--- a/gcc/testsuite/g++.dg/template/crash109.C
+++ /dev/null
@@ -1,10 +0,0 @@
-// PR c++/50864
-
-namespace impl
-{
-  template <class T> T create();
-}
-
-template <class T, class U, __SIZE_TYPE__
-	  = sizeof(impl::create<T>() -> impl::create<U>())>  // { dg-error "not a member" } 
-struct foo;