diff --git a/checkin_notes b/checkin_notes
index 6b129b3491..69c12bcd7f 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -1508,3 +1508,10 @@ David  7 Feb 2012
         pers_file_xfer.cpp
         cs_apps.cpp
         cs_files.cpp
+
+Rom    8 Feb 2012
+    - VBOX: Remove the renaming of the vm disk image code. It isn't needed
+        and it complicates things in the CC.
+        
+    samples/vboxwrapper/
+        vboxwrapper.cpp
diff --git a/samples/vboxwrapper/vboxwrapper.cpp b/samples/vboxwrapper/vboxwrapper.cpp
index 13966cdcbb..2ab2fdddbf 100644
--- a/samples/vboxwrapper/vboxwrapper.cpp
+++ b/samples/vboxwrapper/vboxwrapper.cpp
@@ -370,18 +370,15 @@ int main(int argc, char** argv) {
 
     boinc_get_init_data_p(&aid);
     vm.vm_master_name = "boinc_";
+    vm.image_filename = IMAGE_FILENAME_COMPLETE;
     if (boinc_is_standalone()) {
         vm.vm_master_name += "standalone";
-        vm.image_filename = IMAGE_FILENAME_COMPLETE;
         if (vm.enable_floppyio) {
             sprintf(buf, "%s.%s", FLOPPY_IMAGE_FILENAME, FLOPPY_IMAGE_FILENAME_EXTENSION);
             vm.floppy_image_filename = buf;
         }
     } else {
         vm.vm_master_name += aid.result_name;
-        sprintf(buf, "%s_%d.%s", IMAGE_FILENAME, aid.slot, IMAGE_FILENAME_EXTENSION);
-        vm.image_filename = buf;
-        boinc_rename(IMAGE_FILENAME_COMPLETE, buf);
         if (vm.enable_floppyio) {
             sprintf(buf, "%s_%d.%s", FLOPPY_IMAGE_FILENAME, aid.slot, FLOPPY_IMAGE_FILENAME_EXTENSION);
             vm.floppy_image_filename = buf;