diff --git a/src/spatial/detail/ArborX_Callbacks.hpp b/src/spatial/detail/ArborX_Callbacks.hpp
index 625ec4dd0..d6f06221b 100644
--- a/src/spatial/detail/ArborX_Callbacks.hpp
+++ b/src/spatial/detail/ArborX_Callbacks.hpp
@@ -45,21 +45,6 @@ struct DefaultCallback
   }
 };
 
-struct LegacyDefaultCallback
-{
-  template <typename Query, typename Value, typename Index,
-            typename OutputFunctor>
-  KOKKOS_FUNCTION void operator()(Query const &,
-                                  PairValueIndex<Value, Index> const &value,
-                                  OutputFunctor const &output) const
-  {
-    // APIv1 callback has the signature operator()(Query, int)
-    // As we store PairValueIndex with potentially non int index (like
-    // unsigned), we explicitly cast it here.
-    output((int)value.index);
-  }
-};
-
 // archetypal alias for a 'tag' type member in user callbacks
 template <typename Callback>
 using CallbackTagArchetypeAlias = typename Callback::tag;
diff --git a/test/ArborXTest_LegacyTree.hpp b/test/ArborXTest_LegacyTree.hpp
index 31427e893..8d2486ce6 100644
--- a/test/ArborXTest_LegacyTree.hpp
+++ b/test/ArborXTest_LegacyTree.hpp
@@ -134,7 +134,9 @@ class LegacyTree : public Tree
   query(ExecutionSpace const &space, Predicates const &predicates, View &&view,
         Args &&...args) const
   {
-    Tree::query(space, predicates, ArborX::Details::LegacyDefaultCallback{},
+    Tree::query(space, predicates,
+                LegacyCallbackWrapper<ArborX::Details::DefaultCallback>{
+                    ArborX::Details::DefaultCallback{}},
                 std::forward<View>(view), std::forward<Args>(args)...);
   }
 
@@ -159,7 +161,9 @@ class LegacyTree : public Tree
     {
       Kokkos::View<int *, typename Tree::memory_space> indices(
           "Testing::indices", 0);
-      Tree::query(space, predicates, ArborX::Details::LegacyDefaultCallback{},
+      Tree::query(space, predicates,
+                  LegacyCallbackWrapper<ArborX::Details::DefaultCallback>{
+                      ArborX::Details::DefaultCallback{}},
                   indices, std::forward<OffsetView>(offset),
                   std::forward<Args>(args)...);
       callback(predicates, std::forward<OffsetView>(offset), indices,