diff --git a/ChangeLog b/ChangeLog
index 0d1fd367c..80a8a90e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 2010-09-10  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/NSString.m: Fix retain/release bugs spotted by clang.
+	* Source/GSFFIInvocation.m: Revert one line in order to get lookup
+	of types working again so that proxies can still be used.
 
 2010-09-10  Adam Fedor  <fedor@gnu.org>
 
diff --git a/Source/GSFFIInvocation.m b/Source/GSFFIInvocation.m
index 31cf9f9d9..76c6ef341 100644
--- a/Source/GSFFIInvocation.m
+++ b/Source/GSFFIInvocation.m
@@ -90,6 +90,12 @@ gs_method_for_receiver_and_selector (id receiver, SEL sel)
  * return types between all equivalent selectors.
  */
 
+/* 
+ * Find the best selector type information we can when we don't know
+ * the receiver (unfortunately most installed gcc/objc systems still
+ * (2010) don't let us know the receiver when forwarding).  This can
+ * never be more than a guess, but in practice it usually works.
+ */
 static INLINE SEL
 gs_find_best_typed_sel (SEL sel)
 {
@@ -99,7 +105,7 @@ gs_find_best_typed_sel (SEL sel)
 
       if (name)
 	{
-	  SEL tmp_sel = sel_getUid(name);
+	  SEL tmp_sel = sel_get_any_typed_uid(name);
 	  if (sel_getType_np(tmp_sel))
 	    return tmp_sel;
 	}