diff --git a/tmcd/tmcd.c b/tmcd/tmcd.c
index a550266cf7f2b007ddeed2af0353c78a517f2d2c..124edd2a89ba733a7eb5db09998e39358c2d6b8e 100644
--- a/tmcd/tmcd.c
+++ b/tmcd/tmcd.c
@@ -8175,10 +8175,10 @@ COMMAND_PROTOTYPE(doemulabconfig)
 	/*
 	 * Stuff from the experiments table.
 	 */
-	res = mydb_query("select elabinelab_cvstag,elabinelab_nosetup "
+	res = mydb_query("select elabinelab_cvstag "
 			 "   from experiments "
 			 "where pid='%s' and eid='%s'",
-			 2, reqp->pid, reqp->eid);
+			 1, reqp->pid, reqp->eid);
 	if (!res) {
 		error("EMULABCONFIG: %s: DB Error getting experiments info\n",
 		      reqp->nodeid);
@@ -8191,9 +8191,6 @@ COMMAND_PROTOTYPE(doemulabconfig)
 		bufp += OUTPUT(bufp, ebufp - bufp, "CVSSRCTAG=%s\n",
 			       row[0]);
 	    }
-	    if (row[1] && strcmp(row[1], "0")) {
-	        bufp += OUTPUT(bufp, ebufp - bufp, "NOSETUP=1\n");
-	    }
 	}
 	mysql_free_result(res);