diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
index 61a6b3b6f..dca68669d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextUpdate.java
@@ -23,7 +23,10 @@ public class ReactTextUpdate {
   private final Spannable mText;
   private final int mJsEventCounter;
   private final boolean mContainsImages;
-  private final Spacing mPadding;
+  private final float mPaddingLeft;
+  private final float mPaddingTop;
+  private final float mPaddingRight;
+  private final float mPaddingBottom;
 
   public ReactTextUpdate(
     Spannable text,
@@ -33,7 +36,10 @@ public class ReactTextUpdate {
     mText = text;
     mJsEventCounter = jsEventCounter;
     mContainsImages = containsImages;
-    mPadding = padding;
+    mPaddingLeft = padding.get(Spacing.LEFT);
+    mPaddingTop = padding.get(Spacing.TOP);
+    mPaddingRight = padding.get(Spacing.RIGHT);
+    mPaddingBottom = padding.get(Spacing.BOTTOM);
   }
 
   public Spannable getText() {
@@ -48,7 +54,19 @@ public class ReactTextUpdate {
     return mContainsImages;
   }
 
-  public Spacing getPadding() {
-    return mPadding;
+  public float getPaddingLeft() {
+    return mPaddingLeft;
+  }
+
+  public float getPaddingTop() {
+    return mPaddingTop;
+  }
+
+  public float getPaddingRight() {
+    return mPaddingRight;
+  }
+
+  public float getPaddingBottom() {
+    return mPaddingBottom;
   }
 }
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
index da7ea7e82..71bb5ccf1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextView.java
@@ -17,7 +17,6 @@ import android.view.Gravity;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.facebook.csslayout.Spacing;
 import com.facebook.react.uimanager.ReactCompoundView;
 
 public class ReactTextView extends TextView implements ReactCompoundView {
@@ -46,12 +45,11 @@ public class ReactTextView extends TextView implements ReactCompoundView {
       setLayoutParams(EMPTY_LAYOUT_PARAMS);
     }
     setText(update.getText());
-    Spacing padding = update.getPadding();
     setPadding(
-      (int) Math.ceil(padding.get(Spacing.LEFT)),
-      (int) Math.ceil(padding.get(Spacing.TOP)),
-      (int) Math.ceil(padding.get(Spacing.RIGHT)),
-      (int) Math.ceil(padding.get(Spacing.BOTTOM)));
+      (int) Math.ceil(update.getPaddingLeft()),
+      (int) Math.ceil(update.getPaddingTop()),
+      (int) Math.ceil(update.getPaddingRight()),
+      (int) Math.ceil(update.getPaddingBottom()));
   }
 
   @Override