diff --git a/Shape_detection/doc/Shape_detection/PackageDescription.txt b/Shape_detection/doc/Shape_detection/PackageDescription.txt
index ffe08f8e0b5..1378207ea0d 100644
--- a/Shape_detection/doc/Shape_detection/PackageDescription.txt
+++ b/Shape_detection/doc/Shape_detection/PackageDescription.txt
@@ -136,7 +136,7 @@ and the Region Growing approach for detecting shapes in a set of arbitrary items
 - `CGAL::Shape_detection::Segment_set::Least_squares_line_fit_sorting<GeomTraits, InputRange, %NeighborQuery, SegmentMap>`
 
 ### Polygon Mesh ###
-- `CGAL::Shape_detection::Polygon_mesh::One_ring_neighbor_query<PolygonMesh, FaceRange>`
+- `CGAL::Shape_detection::Polygon_mesh::One_ring_neighbor_query<PolygonMesh>`
 - `CGAL::Shape_detection::Polygon_mesh::Polyline_graph<GeomTraits, PolygonMesh, FaceRange, EdgeRange, VertexToPointMap>`
 - `CGAL::Shape_detection::Polygon_mesh::Least_squares_plane_fit_region<GeomTraits, PolygonMesh, FaceRange, VertexToPointMap>`
 - `CGAL::Shape_detection::Polygon_mesh::Least_squares_plane_fit_sorting<GeomTraits, PolygonMesh, %NeighborQuery, FaceRange, VertexToPointMap>`
diff --git a/Shape_detection/examples/Shape_detection/region_growing_planes_on_polygon_mesh.cpp b/Shape_detection/examples/Shape_detection/region_growing_planes_on_polygon_mesh.cpp
index f0caab5c229..6780cd8b44e 100644
--- a/Shape_detection/examples/Shape_detection/region_growing_planes_on_polygon_mesh.cpp
+++ b/Shape_detection/examples/Shape_detection/region_growing_planes_on_polygon_mesh.cpp
@@ -25,7 +25,7 @@ using Point_3 = typename Kernel::Point_3;
 #else
     using Polygon_mesh   = CGAL::Polyhedron_3<Kernel, CGAL::Polyhedron_items_3, CGAL::HalfedgeDS_vector>;
     using Face_range     = typename CGAL::Iterator_range<typename boost::graph_traits<Polygon_mesh>::face_iterator>;
-    using Neighbor_query = CGAL::Shape_detection::Polygon_mesh::One_ring_neighbor_query<Polygon_mesh, Face_range>;
+    using Neighbor_query = CGAL::Shape_detection::Polygon_mesh::One_ring_neighbor_query<Polygon_mesh>;
     using Region_type    = CGAL::Shape_detection::Polygon_mesh::Least_squares_plane_fit_region<Kernel, Polygon_mesh, Face_range>;
     using Sorting        = CGAL::Shape_detection::Polygon_mesh::Least_squares_plane_fit_sorting<Kernel, Polygon_mesh, Neighbor_query, Face_range>;
 #endif
diff --git a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Region_growing_on_polygon_mesh/One_ring_neighbor_query.h b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Region_growing_on_polygon_mesh/One_ring_neighbor_query.h
index 19b78b89450..d05bebf52f0 100644
--- a/Shape_detection/include/CGAL/Shape_detection/Region_growing/Region_growing_on_polygon_mesh/One_ring_neighbor_query.h
+++ b/Shape_detection/include/CGAL/Shape_detection/Region_growing/Region_growing_on_polygon_mesh/One_ring_neighbor_query.h
@@ -42,7 +42,7 @@ namespace Polygon_mesh {
   */
   template<typename PolygonMesh
 #ifndef CGAL_NO_DEPRECATED_CODE
-  , typename FaceRange = typename PolygonMesh::Face_range
+  , typename FaceRange = void
 #endif
   >
   class One_ring_neighbor_query
diff --git a/Shape_detection/include/CGAL/Shape_detection/Region_growing/internal/free_functions.h b/Shape_detection/include/CGAL/Shape_detection/Region_growing/internal/free_functions.h
index 8343c78325b..797d418620f 100644
--- a/Shape_detection/include/CGAL/Shape_detection/Region_growing/internal/free_functions.h
+++ b/Shape_detection/include/CGAL/Shape_detection/Region_growing/internal/free_functions.h
@@ -151,7 +151,7 @@ OutputIterator region_growing_planes(
   using Traits = GeomTraits;
   using Polyhedron = CGAL::Polyhedron_3<Traits, CGAL::Polyhedron_items_3, CGAL::HalfedgeDS_vector>;
   using Face_range = typename CGAL::Iterator_range<typename boost::graph_traits<Polyhedron>::face_iterator>;
-  using Neighbor_query = Polygon_mesh::One_ring_neighbor_query<Polyhedron, Face_range>;
+  using Neighbor_query = Polygon_mesh::One_ring_neighbor_query<Polyhedron>;
   using Region_type = Polygon_mesh::Least_squares_plane_fit_region<Traits, Polyhedron, Face_range>;
   using Sorting = Polygon_mesh::Least_squares_plane_fit_sorting<Traits, Polyhedron, Neighbor_query, Face_range>;
   using Region_growing = Region_growing<Face_range, Neighbor_query, Region_type, typename Sorting::Seed_map>;
diff --git a/Shape_detection/test/Shape_detection/test_region_growing_on_cube.cpp b/Shape_detection/test/Shape_detection/test_region_growing_on_cube.cpp
index e9067a55b11..42fabc4a152 100644
--- a/Shape_detection/test/Shape_detection/test_region_growing_on_cube.cpp
+++ b/Shape_detection/test/Shape_detection/test_region_growing_on_cube.cpp
@@ -30,7 +30,7 @@ bool test_region_growing_on_cube(int argc, char *argv[]) {
   using Polyhedron = CGAL::Polyhedron_3<Kernel, CGAL::Polyhedron_items_3, CGAL::HalfedgeDS_vector>;
   using Face_range = typename CGAL::Iterator_range<typename boost::graph_traits<Polyhedron>::face_iterator>;
 
-  using Neighbor_query = SD::Polygon_mesh::One_ring_neighbor_query<Polyhedron, Face_range>;
+  using Neighbor_query = SD::Polygon_mesh::One_ring_neighbor_query<Polyhedron>;
   using Region_type    = SD::Polygon_mesh::Least_squares_plane_fit_region<Kernel, Polyhedron, Face_range>;
   using Sorting        = SD::Polygon_mesh::Least_squares_plane_fit_sorting<Kernel, Polyhedron, Neighbor_query, Face_range>;
   using Region_growing = SD::Region_growing<Face_range, Neighbor_query, Region_type, typename Sorting::Seed_map>;