diff --git a/mediapipe/framework/api2/node.h b/mediapipe/framework/api2/node.h
index 7061afcae..de10bffa7 100644
--- a/mediapipe/framework/api2/node.h
+++ b/mediapipe/framework/api2/node.h
@@ -223,23 +223,21 @@ class SubgraphImpl : public Subgraph, public Intf {
 
 // This macro is used to register a calculator that does not use automatic
 // registration. Deprecated.
-#define MEDIAPIPE_NODE_IMPLEMENTATION(Impl)                                  \
-  static mediapipe::NoDestructor<mediapipe::RegistrationToken>               \
-  REGISTRY_STATIC_VAR(calculator_registration,                               \
-                      __LINE__)(mediapipe::CalculatorBaseRegistry::Register( \
-      Impl::kCalculatorName,                                                 \
-      absl::make_unique<mediapipe::internal::CalculatorBaseFactoryFor<Impl>>))
+#define MEDIAPIPE_NODE_IMPLEMENTATION(Impl)                       \
+  MEDIAPIPE_REGISTER_FACTORY_FUNCTION_QUALIFIED(                  \
+      mediapipe::CalculatorBaseRegistry, calculator_registration, \
+      Impl::kCalculatorName,                                      \
+      absl::make_unique<mediapipe::internal::CalculatorBaseFactoryFor<Impl>>)
 
 // This macro is used to register a non-split-contract calculator. Deprecated.
 #define MEDIAPIPE_REGISTER_NODE(name) REGISTER_CALCULATOR(name)
 
 // This macro is used to define a subgraph that does not use automatic
 // registration. Deprecated.
-#define MEDIAPIPE_SUBGRAPH_IMPLEMENTATION(Impl)                        \
-  static mediapipe::NoDestructor<mediapipe::RegistrationToken>         \
-  REGISTRY_STATIC_VAR(subgraph_registration,                           \
-                      __LINE__)(mediapipe::SubgraphRegistry::Register( \
-      Impl::kCalculatorName, absl::make_unique<Impl>))
+#define MEDIAPIPE_SUBGRAPH_IMPLEMENTATION(Impl)           \
+  MEDIAPIPE_REGISTER_FACTORY_FUNCTION_QUALIFIED(          \
+      mediapipe::SubgraphRegistry, subgraph_registration, \
+      Impl::kCalculatorName, absl::make_unique<Impl>)
 
 }  // namespace api2
 }  // namespace mediapipe
diff --git a/mediapipe/framework/deps/registration.h b/mediapipe/framework/deps/registration.h
index 74c616d85..6ed1d05c0 100644
--- a/mediapipe/framework/deps/registration.h
+++ b/mediapipe/framework/deps/registration.h
@@ -396,6 +396,13 @@ class GlobalFactoryRegistry {
       new mediapipe::RegistrationToken(                              \
           RegistryType::Register(#name, __VA_ARGS__))
 
+#define MEDIAPIPE_REGISTER_FACTORY_FUNCTION_QUALIFIED(RegistryType, var_name, \
+                                                      name, ...)              \
+  static auto* REGISTRY_STATIC_VAR(var_name, __LINE__) =                      \
+      new mediapipe::RegistrationToken(                                       \
+          RegistryType::Register(name, __VA_ARGS__))
+
+// TODO: migrate to the above.
 #define REGISTER_FACTORY_FUNCTION_QUALIFIED(RegistryType, var_name, name, ...) \
   static auto* REGISTRY_STATIC_VAR(var_name, __LINE__) =                       \
       new mediapipe::RegistrationToken(                                        \