diff --git a/lustre/include/obd_class.h b/lustre/include/obd_class.h
index ac668cf1cbcbbb1b745141335ae9b5416ba2b7c0..d7964055ccbd40c3b46aed92d6c2767f5784909f 100644
--- a/lustre/include/obd_class.h
+++ b/lustre/include/obd_class.h
@@ -100,7 +100,6 @@ void class_decref(struct obd_device *obd);
 #define CFG_F_SKIP      0x04   /* We should ignore this cfg command */
 #define CFG_F_COMPAT146 0x08   /* Allow old-style logs */
 #define CFG_F_EXCLUDE   0x10   /* OST exclusion list */
-#define CFG_F_SERVER146 0x20   /* Using old server */
 
 /* Passed as data param to class_config_parse_llog */
 struct config_llog_instance {
diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c
index 70ac74853c9bf78287b2976e0d7a2135c4de20cd..503a6a71fee770a8aaff1af7004459036fd2ab7d 100644
--- a/lustre/llite/llite_lib.c
+++ b/lustre/llite/llite_lib.c
@@ -934,7 +934,9 @@ int ll_fill_super(struct super_block *sb)
                                 memcpy(lsi->lsi_lmd->lmd_profile, oldname,
                                        strlen(oldname) + 1); 
                                 profilenm = get_profile_name(sb);
-                                cfg.cfg_flags |= CFG_F_SERVER146;
+                                /* Don't ever try to recover the MGS */
+                                rc = ptlrpc_set_import_active(
+                                        lsi->lsi_mgc->u.cli.cl_import, 0);
                         }
                         OBD_FREE(oldname, oldnamelen);
                 }
diff --git a/lustre/mgc/mgc_request.c b/lustre/mgc/mgc_request.c
index 4b8fd76ea4bedcf574b192bc2b56d4f169875f32..8756885d4ba7f0542b0892183efe62adb846d3ac 100644
--- a/lustre/mgc/mgc_request.c
+++ b/lustre/mgc/mgc_request.c
@@ -147,7 +147,7 @@ static struct config_llog_data *config_log_find(char *logname,
         }
         spin_unlock(&config_list_lock);
 
-        CERROR("can't get log %s\n", logid);
+        CDEBUG(D_CONFIG, "can't get log %s\n", logid);
         RETURN(ERR_PTR(-ENOENT));
 out_found:
         atomic_inc(&cld->cld_refcount);
@@ -1033,11 +1033,6 @@ static int mgc_process_log(struct obd_device *mgc,
         if (cld->cld_stopping) 
                 RETURN(0);
 
-        if (cld->cld_cfg.cfg_flags & CFG_F_SERVER146)
-                /* If we started from an old MDT, don't bother trying to
-                   get log updates from the MGS */
-                RETURN(0);
-
         OBD_FAIL_TIMEOUT(OBD_FAIL_MGC_PROCESS_LOG, 20);
 
         lsi = s2lsi(cld->cld_cfg.cfg_sb);