diff --git a/yoga/YGLayout.h b/yoga/YGLayout.h
index 658a31f2..30b8dd76 100644
--- a/yoga/YGLayout.h
+++ b/yoga/YGLayout.h
@@ -6,10 +6,12 @@
  */
 
 #pragma once
-#include "Bitfield.h"
+#include "BitUtils.h"
 #include "YGFloatOptional.h"
 #include "Yoga-internal.h"
 
+using namespace facebook::yoga;
+
 struct YGLayout {
   std::array<float, 4> position = {};
   std::array<float, 2> dimensions = {{YGUndefined, YGUndefined}};
@@ -18,12 +20,14 @@ struct YGLayout {
   std::array<float, 4> padding = {};
 
 private:
-  static constexpr size_t directionIdx = 0;
-  static constexpr size_t didUseLegacyFlagIdx = 1;
-  static constexpr size_t doesLegacyStretchFlagAffectsLayoutIdx = 2;
-  static constexpr size_t hadOverflowIdx = 3;
-  facebook::yoga::Bitfield<uint8_t, YGDirection, bool, bool, bool> flags_ =
-      {YGDirectionInherit, false, false, false};
+  static constexpr size_t directionOffset = 0;
+  static constexpr size_t didUseLegacyFlagOffset =
+      directionOffset + facebook::yoga::detail::bitWidthFn<YGDirection>();
+  static constexpr size_t doesLegacyStretchFlagAffectsLayoutOffset =
+      didUseLegacyFlagOffset + 1;
+  static constexpr size_t hadOverflowOffset =
+      doesLegacyStretchFlagAffectsLayoutOffset + 1;
+  uint8_t flags = 0;
 
 public:
   uint32_t computedFlexBasisGeneration = 0;
@@ -41,27 +45,41 @@ public:
 
   YGCachedMeasurement cachedLayout = YGCachedMeasurement();
 
-  YGDirection direction() const { return flags_.at<directionIdx>(); }
-  decltype(flags_)::Ref<directionIdx> direction() {
-    return flags_.at<directionIdx>();
+  YGDirection direction() const {
+    return facebook::yoga::detail::getEnumData<YGDirection>(
+        flags, directionOffset);
   }
 
-  bool didUseLegacyFlag() const { return flags_.at<didUseLegacyFlagIdx>(); }
-  decltype(flags_)::Ref<didUseLegacyFlagIdx> didUseLegacyFlag() {
-    return flags_.at<didUseLegacyFlagIdx>();
+  void setDirection(YGDirection direction) {
+    facebook::yoga::detail::setEnumData<YGDirection>(
+        flags, directionOffset, direction);
+  }
+
+  bool didUseLegacyFlag() const {
+    return facebook::yoga::detail::getBooleanData(
+        flags, didUseLegacyFlagOffset);
+  }
+
+  void setDidUseLegacyFlag(bool val) {
+    facebook::yoga::detail::setBooleanData(flags, didUseLegacyFlagOffset, val);
   }
 
   bool doesLegacyStretchFlagAffectsLayout() const {
-    return flags_.at<doesLegacyStretchFlagAffectsLayoutIdx>();
-  }
-  decltype(flags_)::Ref<doesLegacyStretchFlagAffectsLayoutIdx>
-  doesLegacyStretchFlagAffectsLayout() {
-    return flags_.at<doesLegacyStretchFlagAffectsLayoutIdx>();
+    return facebook::yoga::detail::getBooleanData(
+        flags, doesLegacyStretchFlagAffectsLayoutOffset);
   }
 
-  bool hadOverflow() const { return flags_.at<hadOverflowIdx>(); }
-  decltype(flags_)::Ref<hadOverflowIdx> hadOverflow() {
-    return flags_.at<hadOverflowIdx>();
+  void setDoesLegacyStretchFlagAffectsLayout(bool val) {
+    facebook::yoga::detail::setBooleanData(
+        flags, doesLegacyStretchFlagAffectsLayoutOffset, val);
+  }
+
+  bool hadOverflow() const {
+    return facebook::yoga::detail::getBooleanData(flags, hadOverflowOffset);
+  }
+  void setHadOverflow(bool hadOverflow) {
+    facebook::yoga::detail::setBooleanData(
+        flags, hadOverflowOffset, hadOverflow);
   }
 
   bool operator==(YGLayout layout) const;
diff --git a/yoga/YGNode.cpp b/yoga/YGNode.cpp
index 1d49b007..71d3a6db 100644
--- a/yoga/YGNode.cpp
+++ b/yoga/YGNode.cpp
@@ -232,7 +232,7 @@ void YGNode::removeChild(uint32_t index) {
 }
 
 void YGNode::setLayoutDirection(YGDirection direction) {
-  layout_.direction() = direction;
+  layout_.setDirection(direction);
 }
 
 void YGNode::setLayoutMargin(float margin, int index) {
@@ -270,7 +270,7 @@ void YGNode::setLayoutMeasuredDimension(float measuredDimension, int index) {
 }
 
 void YGNode::setLayoutHadOverflow(bool hadOverflow) {
-  layout_.hadOverflow() = hadOverflow;
+  layout_.setHadOverflow(hadOverflow);
 }
 
 void YGNode::setLayoutDimension(float dimension, int index) {
@@ -536,11 +536,11 @@ bool YGNode::didUseLegacyFlag() {
 
 void YGNode::setLayoutDoesLegacyFlagAffectsLayout(
     bool doesLegacyFlagAffectsLayout) {
-  layout_.doesLegacyStretchFlagAffectsLayout() = doesLegacyFlagAffectsLayout;
+  layout_.setDoesLegacyStretchFlagAffectsLayout(doesLegacyFlagAffectsLayout);
 }
 
 void YGNode::setLayoutDidUseLegacyFlag(bool didUseLegacyFlag) {
-  layout_.didUseLegacyFlag() = didUseLegacyFlag;
+  layout_.setDidUseLegacyFlag(didUseLegacyFlag);
 }
 
 bool YGNode::isLayoutTreeEqualToNode(const YGNode& node) const {