=== include/parrot/library.h
==================================================================
--- include/parrot/library.h	(revision 1983)
+++ include/parrot/library.h	(local)
@@ -38,7 +38,6 @@
 PARROT_API STRING* Parrot_locate_runtime_file_str(Interp *, STRING *file_name,
         enum_runtime_ft);
 
-PARROT_API void Parrot_autoload_class(Interp *, STRING *class);
 PARROT_API const char* Parrot_get_runtime_prefix(Interp *, STRING **prefix);
 void parrot_init_library_paths(Interp *);
 STRING * parrot_split_path_ext(Interp* , STRING *in,
=== src/library.c
==================================================================
--- src/library.c	(revision 1983)
+++ src/library.c	(local)
@@ -341,42 +341,6 @@
 
 /*
 
-=item C<void Parrot_autoload_class(Interp *, STRING *class)>
-
-Try to load a library that holds the PMC class.
-
-XXX Check if this is still needed with HLL type mappings.
-
-=cut
-
-*/
-void
-Parrot_autoload_class(Interp *interpreter, STRING *class)
-{
-    static const struct {
-        const char *prefix;
-        const char *lib;
-    } mappings[] = {
-        { "Py", "python_group" },
-        { "Tcl", "tcl_group" }
-    };
-    size_t i;
-    char *cclass;
-
-    cclass = string_to_cstring(interpreter, class);
-    for (i = 0; i < sizeof(mappings)/sizeof(mappings[0]); ++i) {
-        if (!memcmp(mappings[i].prefix, cclass, strlen(mappings[i].prefix))) {
-            STRING *slib = const_string(interpreter, mappings[i].lib);
-            Parrot_load_lib(interpreter, slib, NULL);
-            break;
-        }
-    }
-    string_cstring_free(cclass);
-
-}
-
-/*
-
 =item C<STRING *
 parrot_split_path_ext(Interp*, STRING *in, STRING **wo_ext, STRING **ext)>
 
=== src/ops/pmc.ops
==================================================================
--- src/ops/pmc.ops	(revision 1983)
+++ src/ops/pmc.ops	(local)
@@ -81,10 +81,8 @@
 op new(out PMC, inconst STR) {
     STRING *class = $2;
     INTVAL type = pmc_type(interpreter, class);
-    if (!type) {
-        Parrot_autoload_class(interpreter, class);
+    if (!type)
         type = pmc_type(interpreter, class);
-    }
     if (type <= 0)
         real_exception(interpreter, NULL, NO_CLASS,
             "Class '%Ss' not found", class);
@@ -95,10 +93,8 @@
 op new(out PMC, inconst STR, in PMC) {
     STRING *class = $2;
     INTVAL type = pmc_type(interpreter, class);
-    if (!type) {
-        Parrot_autoload_class(interpreter, class);
+    if (!type)
         type = pmc_type(interpreter, class);
-    }
     if (type <= 0)
         real_exception(interpreter, NULL, NO_CLASS,
             "Class '%Ss' not found", class);
=== src/pic.c
==================================================================
--- src/pic.c	(revision 1983)
+++ src/pic.c	(local)
@@ -565,10 +565,8 @@
                 INTVAL type;
                 class = (STRING *)cur_opcode[2];
                 type = pmc_type(interpreter, class);
-                if (!type) {
-                    Parrot_autoload_class(interpreter, class);
+                if (!type)
                     type = pmc_type(interpreter, class);
-                }
                 if (type <= 0)
                     real_exception(interpreter, NULL, NO_CLASS,
                             "Class '%Ss' not found", class);