diff --git a/checkin_notes b/checkin_notes
index dbda25484b..c8bd84fb17 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -2628,3 +2628,11 @@ David  7 Apr 2010
     html/ops/
         manage_special_users.php
         profile_screen_form.php
+
+David  7 Apr 2010
+    - client: revert [21035]; remove project_init.xml only if
+        attached to the project it specifies
+        (requested by Kevin Reed)
+
+    client/
+        gui_rpc_server_ops.cpp
diff --git a/client/gui_rpc_server_ops.cpp b/client/gui_rpc_server_ops.cpp
index b55d68b7e7..9379e2d8b6 100644
--- a/client/gui_rpc_server_ops.cpp
+++ b/client/gui_rpc_server_ops.cpp
@@ -604,11 +604,15 @@ static void handle_network_available(char*, MIOFILE& fout) {
 }
 
 static void handle_get_project_init_status(char*, MIOFILE& fout) {
-    // If we're already attached to a project, delete the file.
+    // If we're already attached to the project specified in the
+    // project init file, delete the file.
     //
-    if (gstate.projects.size()) {
-        gstate.project_init.remove();
-        msg_printf(0, MSG_INFO, "Already attached - deleting %s", PROJECT_INIT_FILENAME);
+    for (unsigned i=0; i<gstate.projects.size(); i++) { 
+        PROJECT* p = gstate.projects[i]; 
+        if (!strcmp(p->master_url, gstate.project_init.url)) { 
+            gstate.project_init.remove(); 
+            break; 
+        } 
     }
 
     fout.printf(