diff --git a/.gitmodules b/.gitmodules
index cf855ae414..06fa2e94b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,6 @@
 [submodule "compose/frameworks/support"]
 	path = compose/frameworks/support
 	url = https://github.com/JetBrains/androidx
-[submodule "compose/golden"]
-	path = compose/golden
-	url = https://android.googlesource.com/platform/frameworks/support-golden
 [submodule "compose/external/doclava"]
 	path = compose/external/doclava
 	url = https://android.googlesource.com/platform/external/doclava
diff --git a/compose/frameworks/support b/compose/frameworks/support
index f86a63acd1..5204cf88fd 160000
--- a/compose/frameworks/support
+++ b/compose/frameworks/support
@@ -1 +1 @@
-Subproject commit f86a63acd12648b0defdf2c706b6eebe3d96d3f6
+Subproject commit 5204cf88fd85665de9071345d0546bae03440d16
diff --git a/compose/golden b/compose/golden
deleted file mode 160000
index ff549f2541..0000000000
--- a/compose/golden
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ff549f2541abc394d0a8874d12f133f6d84977cd