diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c
index 824b05e8e..b5d921b3a 100644
--- a/src/bin/e_start_main.c
+++ b/src/bin/e_start_main.c
@@ -423,24 +423,26 @@ main(int argc, char **argv)
      {
         stop_ptrace = EINA_FALSE;
 
-/*        
-        if (cs_child < 0)
-          {             
-             cs_child = fork();
-             if (cs_child == 0) 
-               {
-                  char *cs_args[2] = { NULL, NULL };
-                  
-                  cs_args[0] = (char *)evas_cserve_path_get();
-                  execv(cs_args[0], cs_args);
-                  exit(-1);
-               }
-             else if (cs_child > 0)
-               {
-                  putenv("EVAS_CSERVE2=1");
+        if (getenv("E_CSERVE"))
+          {
+             if (cs_child < 0)
+               {             
+                  cs_child = fork();
+                  if (cs_child == 0) 
+                    {
+                       char *cs_args[2] = { NULL, NULL };
+                       
+                       cs_args[0] = (char *)evas_cserve_path_get();
+                       execv(cs_args[0], cs_args);
+                       exit(-1);
+                    }
+                  else if (cs_child > 0)
+                    {
+                       putenv("EVAS_CSERVE2=1");
+                    }
                }
           }
- */
+
         child = fork();
 
         if (child < 0) /* failed attempt */