diff --git a/vtkm/filter/testing/UnitTestContourFilter.cxx b/vtkm/filter/testing/UnitTestContourFilter.cxx
index da1a2d38a38abcc44d12c8563747bb40b67a60e8..6a085fb59f99f5315d71645cbfbf778af4dbf908 100644
--- a/vtkm/filter/testing/UnitTestContourFilter.cxx
+++ b/vtkm/filter/testing/UnitTestContourFilter.cxx
@@ -140,12 +140,14 @@ public:
 
   void TestContourWedges() const
   {
+    std::cout << "Testing Contour filter on wedge cells" << std::endl;
+
     auto pathname = vtkm::cont::testing::Testing::DataPath("unstructured/wedge_cells.vtk");
     vtkm::io::VTKDataSetReader reader(pathname);
 
     vtkm::cont::DataSet dataSet = reader.ReadDataSet();
 
-    vtkm::cont::CellSetExplicit<> cellSet;
+    vtkm::cont::CellSetSingleType<> cellSet;
     dataSet.GetCellSet().CopyTo(cellSet);
 
     vtkm::cont::ArrayHandle<vtkm::Float32> fieldArray;
diff --git a/vtkm/io/VTKUnstructuredGridReader.cxx b/vtkm/io/VTKUnstructuredGridReader.cxx
index 0fb69cacbf07610006ea82201cfccaefaf8bfcec..8a5a0b136e8691ba98946b76ab0b99d7a9735363 100644
--- a/vtkm/io/VTKUnstructuredGridReader.cxx
+++ b/vtkm/io/VTKUnstructuredGridReader.cxx
@@ -65,8 +65,7 @@ void VTKUnstructuredGridReader::Read()
   vtkm::io::internal::FixupCellSet(connectivity, numIndices, shapes, permutation);
   this->SetCellsPermutation(permutation);
 
-  //DRP
-  if (false) //vtkm::io::internal::IsSingleShape(shapes))
+  if (vtkm::io::internal::IsSingleShape(shapes))
   {
     vtkm::cont::CellSetSingleType<> cellSet;
     cellSet.Fill(