diff --git a/AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h b/AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
index acb4144da4f..48c95cfd1b2 100644
--- a/AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
+++ b/AABB_tree/include/CGAL/AABB_face_graph_triangle_primitive.h
@@ -26,9 +26,18 @@
 #include <CGAL/Polyhedron_3.h>
 #include <CGAL/Polyhedron_3_property_map.h>
 #include <CGAL/Default.h>
+#include <boost/mpl/has_xxx.hpp>
+#include <boost/mpl/if.hpp>
 
 namespace CGAL {
 
+
+#ifndef CGAL_NO_DEPRECATED_CODE
+namespace internal_aabb_tree{
+  BOOST_MPL_HAS_XXX_TRAIT_NAMED_DEF(Has_facet_const_handle,Facet_const_handle,false)
+}
+#endif
+
 /*!
  * \ingroup PkgAABB_tree
  * Primitive type for a facet of a polyhedral surface.
@@ -137,6 +146,16 @@ public:
             Triangle_property_map(&graph),
             Point_property_map(&graph) )
   {}
+
+  AABB_face_graph_triangle_primitive(
+      typename boost::mpl::if_<
+        typename internal_aabb_tree::Has_facet_const_handle<FaceGraph>::type,
+        typename FaceGraph::Facet_const_handle,
+        void*>::type fd, FaceGraph& graph
+  ) : Base( Id_(fd.remove_const()),
+            Triangle_property_map(&graph),
+            Point_property_map(&graph) )
+  {}
 #endif
 #endif