diff --git a/android/src/fabric/java/com/horcrux/svg/FabricEnabledViewGroup.java b/android/src/fabric/java/com/horcrux/svg/FabricEnabledViewGroup.java
deleted file mode 100644
index 81a78e708..000000000
--- a/android/src/fabric/java/com/horcrux/svg/FabricEnabledViewGroup.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.horcrux.svg;
-
-import android.content.Context;
-import androidx.annotation.UiThread;
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.bridge.ReadableMap;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.uimanager.FabricViewStateManager;
-import com.facebook.react.uimanager.FabricViewStateManager.HasFabricViewStateManager;
-import com.facebook.react.uimanager.FabricViewStateManager.StateUpdateCallback;
-import com.facebook.react.uimanager.PixelUtil;
-import com.facebook.react.views.view.ReactViewGroup;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-public abstract class FabricEnabledViewGroup extends ReactViewGroup
-    implements HasFabricViewStateManager {
-  private final FabricViewStateManager mFabricViewStateManager = new FabricViewStateManager();
-
-  @NotNull
-  public FabricViewStateManager getFabricViewStateManager() {
-    return this.mFabricViewStateManager;
-  }
-
-  protected final void updateScreenSizeFabric(int width, int height) {
-    this.updateState(width, height);
-  }
-
-  @UiThread
-  public final void updateState(int width, int height) {
-    final float realWidth = PixelUtil.toDIPFromPixel((float) width);
-    final float realHeight = PixelUtil.toDIPFromPixel((float) height);
-    ReadableMap currentState = this.mFabricViewStateManager.getStateData();
-    if (currentState != null) {
-      float delta = 0.9F;
-      float stateFrameHeight =
-          currentState.hasKey("frameHeight") ? (float) currentState.getDouble("frameHeight") : 0.0F;
-      float stateFrameWidth =
-          currentState.hasKey("frameWidth") ? (float) currentState.getDouble("frameWidth") : 0.0F;
-      if (Math.abs(stateFrameWidth - realWidth) < delta
-          && Math.abs(stateFrameHeight - realHeight) < delta) {
-        return;
-      }
-    }
-
-    this.mFabricViewStateManager.setState(
-        (StateUpdateCallback)
-            (new StateUpdateCallback() {
-              public final WritableMap getStateUpdate() {
-                WritableMap map = (WritableMap) (new WritableNativeMap());
-                map.putDouble("frameWidth", (double) realWidth);
-                map.putDouble("frameHeight", (double) realHeight);
-                return map;
-              }
-            }));
-  }
-
-  public FabricEnabledViewGroup(@Nullable ReactContext context) {
-    super((Context) context);
-  }
-}
diff --git a/android/src/main/java/com/horcrux/svg/SvgView.java b/android/src/main/java/com/horcrux/svg/SvgView.java
index ec8d89c7c..bb4e1bb7f 100644
--- a/android/src/main/java/com/horcrux/svg/SvgView.java
+++ b/android/src/main/java/com/horcrux/svg/SvgView.java
@@ -26,6 +26,7 @@
 import com.facebook.react.uimanager.ReactCompoundView;
 import com.facebook.react.uimanager.ReactCompoundViewGroup;
 import com.facebook.react.uimanager.annotations.ReactProp;
+import com.facebook.react.views.view.ReactViewGroup;
 import java.io.ByteArrayOutputStream;
 import java.util.HashMap;
 import java.util.Map;
@@ -34,8 +35,7 @@
 
 /** Custom {@link View} implementation that draws an RNSVGSvg React view and its children. */
 @SuppressLint("ViewConstructor")
-public class SvgView extends FabricEnabledViewGroup
-    implements ReactCompoundView, ReactCompoundViewGroup {
+public class SvgView extends ReactViewGroup implements ReactCompoundView, ReactCompoundViewGroup {
 
   @Override
   public boolean interceptsTouchEvent(float touchX, float touchY) {
diff --git a/android/src/paper/java/com/horcrux/svg/FabricEnabledViewGroup.java b/android/src/paper/java/com/horcrux/svg/FabricEnabledViewGroup.java
deleted file mode 100644
index 08ab8605d..000000000
--- a/android/src/paper/java/com/horcrux/svg/FabricEnabledViewGroup.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.horcrux.svg;
-
-import com.facebook.react.bridge.ReactContext;
-import com.facebook.react.views.view.ReactViewGroup;
-import org.jetbrains.annotations.Nullable;
-
-public abstract class FabricEnabledViewGroup extends ReactViewGroup {
-
-  public FabricEnabledViewGroup(@Nullable ReactContext context) {
-    super(context);
-  }
-
-  protected final void updateScreenSizeFabric(int width, int height) {
-    // do nothing
-  }
-}