diff --git a/ReactCommon/yoga/yoga/YGMarker.h b/ReactCommon/yoga/yoga/YGMarker.h
index 785f56292d0..025e246acba 100644
--- a/ReactCommon/yoga/yoga/YGMarker.h
+++ b/ReactCommon/yoga/yoga/YGMarker.h
@@ -13,10 +13,8 @@ YG_EXTERN_C_BEGIN
 typedef struct YGNode* YGNodeRef;
 typedef struct YGConfig* YGConfigRef;
 
-typedef YG_ENUM_BEGIN(YGMarker){
-    YGMarkerMeasure,
-    YGMarkerBaselineFn,
-} YG_ENUM_END(YGMarker);
+typedef YG_ENUM_BEGIN(YGMarker) {}
+YG_ENUM_END(YGMarker);
 
 typedef struct {
   int layouts;
@@ -62,13 +60,6 @@ struct NoMarkerData {
   using type = YGMarkerNoData;
   static type*& get(YGMarkerData& d) { return d.noData; }
 };
-
-template <>
-struct MarkerData<YGMarkerMeasure> : NoMarkerData {};
-
-template <>
-struct MarkerData<YGMarkerBaselineFn> : NoMarkerData {};
-
 } // namespace detail
 
 template <YGMarker M>
diff --git a/ReactCommon/yoga/yoga/Yoga.cpp b/ReactCommon/yoga/yoga/Yoga.cpp
index d8175295eac..e3cc78bce4b 100644
--- a/ReactCommon/yoga/yoga/Yoga.cpp
+++ b/ReactCommon/yoga/yoga/Yoga.cpp
@@ -1000,9 +1000,7 @@ static float YGBaseline(const YGNodeRef node, void* layoutContext) {
 
     Event::publish<Event::NodeBaselineStart>(node);
 
-    const float baseline = marker::MarkerSection<YGMarkerBaselineFn>::wrap(
-        node,
-        &YGNode::baseline,
+    const float baseline = node->baseline(
         node->getLayout().measuredDimensions[YGDimensionWidth],
         node->getLayout().measuredDimensions[YGDimensionHeight],
         layoutContext);
@@ -1638,9 +1636,7 @@ static void YGNodeWithMeasureFuncSetMeasuredDimensions(
     Event::publish<Event::MeasureCallbackStart>(node);
 
     // Measure the text under the current constraints.
-    const YGSize measuredSize = marker::MarkerSection<YGMarkerMeasure>::wrap(
-        node,
-        &YGNode::measure,
+    const YGSize measuredSize = node->measure(
         innerWidth,
         widthMeasureMode,
         innerHeight,