diff --git a/base/setup/lib/utils/partlist.c b/base/setup/lib/utils/partlist.c
index 9f1588dfebbd5..667eb8fa7c929 100644
--- a/base/setup/lib/utils/partlist.c
+++ b/base/setup/lib/utils/partlist.c
@@ -3923,6 +3923,16 @@ WritePartitions(
     DumpPartitionTable(DiskEntry);
 #endif
 
+#if 0 // TODO: Investigate whether this is really necessary??
+    {
+    ULONG i;
+    for (i = 0; i < DiskEntry->LayoutBuffer->PartitionCount; i++)
+    {
+        DiskEntry->LayoutBuffer->PartitionEntry[i].RewritePartition = FALSE;
+    }
+    }
+#endif
+
     /* Update the partition numbers and device names */
 
 #if 0
@@ -3945,6 +3955,7 @@ WritePartitions(
         if (PartEntry->New)
         {
             PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex];
+            /**/PartitionInfo->RewritePartition = FALSE;/**/
             PartEntry->PartitionNumber = PartitionInfo->PartitionNumber;
             InitPartitionDeviceName(PartEntry);
         }
@@ -3963,6 +3974,7 @@ WritePartitions(
         if (PartEntry->New)
         {
             PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex];
+            /**/PartitionInfo->RewritePartition = FALSE;/**/
             PartEntry->PartitionNumber = PartitionInfo->PartitionNumber;
             InitPartitionDeviceName(PartEntry);
         }
@@ -3978,6 +3990,7 @@ WritePartitions(
         // ASSERT(PartEntry->PartitionType != PARTITION_ENTRY_UNUSED);
         PartEntry->New = FALSE;
         PartitionInfo = &DiskEntry->LayoutBuffer->PartitionEntry[PartEntry->PartitionIndex];
+        /**/PartitionInfo->RewritePartition = FALSE;/**/
         PartEntry->PartitionNumber = PartitionInfo->PartitionNumber;
     }
 #endif