--- a/src/run-js-test.c~	2012-03-13 03:43:56.296910828 +0400
+++ b/src/run-js-test.c	2012-03-13 03:44:39.567673124 +0400
@@ -127,14 +127,6 @@
   g_set_prgname (title);
   g_free (title);
 
-#if HAVE_BLUETOOTH
-  /* The module imports are all so intertwined that if the test
-   * imports anything in js/ui, it will probably eventually end up
-   * pulling in ui/status/bluetooth.js. So we need this.
-   */
-  g_irepository_prepend_search_path (BLUETOOTH_DIR);
-#endif
-
   /* evaluate the script */
   error = NULL;
   if (!gjs_context_eval (js_context, script, len,
--- a/src/main.c~	2012-09-19 13:50:57.000000000 +0400
+++ b/src/main.c	2012-09-21 03:02:30.925591686 +0400
@@ -183,13 +183,12 @@
 static void
 shell_introspection_init (void)
 {
-
-  g_irepository_prepend_search_path (MUTTER_TYPELIB_DIR);
+/*  g_irepository_prepend_search_path (MUTTER_TYPELIB_DIR); */
   g_irepository_prepend_search_path (GNOME_SHELL_PKGLIBDIR);
-#if HAVE_BLUETOOTH
+/* #if HAVE_BLUETOOTH
   g_irepository_prepend_search_path (BLUETOOTH_DIR);
 #endif
-
+*/
 }
 
 static void