diff --git a/include/boost/python/object/class.hpp b/include/boost/python/object/class.hpp
index d453967c..468240c0 100644
--- a/include/boost/python/object/class.hpp
+++ b/include/boost/python/object/class.hpp
@@ -65,20 +65,6 @@ struct instance
     instance_holder* objects;
 };
 
-// Given an undecorated type_id, find the instance data which
-// corresponds to it, or return 0 in case no such type is held.
-BOOST_PYTHON_DECL void* find_instance_impl(PyObject*, converter::undecorated_type_id_t);
-
-// This produces a function with the right signature for use in from_python conversions
-template <class T>
-struct instance_finder
-{
-    static inline void* execute(PyObject* p)
-    {
-        return find_instance_impl(p, converter::undecorated_type_id<T>());
-    }
-};
-
 BOOST_PYTHON_DECL ref class_metatype();
 BOOST_PYTHON_DECL ref class_type();
 
diff --git a/include/boost/python/object/class_converters.hpp b/include/boost/python/object/class_converters.hpp
index 540565bf..5c2a35ae 100644
--- a/include/boost/python/object/class_converters.hpp
+++ b/include/boost/python/object/class_converters.hpp
@@ -10,6 +10,7 @@
 # include <boost/mpl/for_each.hpp>
 # include <boost/python/reference.hpp>
 # include <boost/python/converter/registry.hpp>
+# include <boost/python/object/find_instance.hpp>
 
 namespace boost { namespace python { namespace objects { 
 
@@ -89,9 +90,7 @@ template <class Derived, class Bases>
 class_converters<Derived,Bases>::class_converters(ref const& type_object)
     : m_wrapper(type_object)
 {
-    converter::registry::insert(
-        &instance_finder<Derived>::execute
-        , converter::undecorated_type_id<Derived>());
+    (void)instance_finder<Derived>::registration;
     
     // register all up/downcasts here
     register_dynamic_id<Derived>();