diff --git a/Android.bp b/Android.bp
index b849ea5..49c011e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -45,10 +45,6 @@
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-// In some branches, this may be module_current instead of module_33 if the SDK prebuilts are not
-// yet dropped there, meaning module_33 cannot be used yet.
-module_33_version = "module_33"
-
 // TODO: remove this default and replace with ConnectivityNextEnableDefaults. This will need to be
 // done separately in each branch due to merge conflicts.
 // Defaults to enable/disable java targets that depend on
@@ -86,7 +82,7 @@
 java_defaults {
     name: "NetworkStackReleaseApiLevel",
     defaults:["NetworkStackReleaseTargetSdk"],
-    sdk_version: module_33_version,
+    sdk_version: "module_33",
     libs: [
         "framework-connectivity",
         "framework-connectivity-t",
@@ -179,7 +175,7 @@
 
 java_library {
     name: "NetworkStackApi33Shims",
-    defaults: ["NetworkStackShimsDefaults", "ConnectivityNextEnableDefaults"],
+    defaults: ["NetworkStackShimsDefaults"],
     srcs: [
         "apishim/33/**/*.java",
     ],
@@ -193,7 +189,7 @@
         "framework-connectivity-t.stubs.module_lib",
         "framework-tethering",
     ],
-    sdk_version: module_33_version,
+    sdk_version: "module_33",
     visibility: ["//visibility:private"],
 }