diff --git a/Filters/ParallelGeometry/vtkPUnstructuredGridGhostCellsGenerator.cxx b/Filters/ParallelGeometry/vtkPUnstructuredGridGhostCellsGenerator.cxx
index 604d33394d25b81cc12211b45de3d2e23cc9bf01..147554bb83009b6d0db3805fec4efdc61c0c011f 100644
--- a/Filters/ParallelGeometry/vtkPUnstructuredGridGhostCellsGenerator.cxx
+++ b/Filters/ParallelGeometry/vtkPUnstructuredGridGhostCellsGenerator.cxx
@@ -837,7 +837,12 @@ void vtkPUnstructuredGridGhostCellsGenerator::ExtractAndSendGhostCells(
     extractCells->SetCellList(cellIdsList);
     extractCells->Update();
     vtkUnstructuredGrid* extractGrid = extractCells->GetOutput();
-    extractGrid->GetCellData()->RemoveArray("vtkOriginalCellIds");
+
+    //There might be case where the originalcellids needs to be removed
+    //but there are definitely cases where it shouldn't.
+    //So if you run into that case, think twice before you uncomment this
+    //next line and look carefully at paraview issue #18470
+    //extractGrid->GetCellData()->RemoveArray("vtkOriginalCellIds");
 
     // Send the extracted grid to the neighbor rank asynchronously
     if (vtkCommunicator::MarshalDataObject(extractGrid, c.SendBuffer))