diff --git a/Android.mk b/Android.mk
index 252eaf5..304a19a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -597,8 +597,8 @@
 # the Runtime APEX. This is a temporary change needed until Golem
 # fully supports the Runtime APEX.
 #
-# TODO(b/121117762, b/129332183): Remove this when the ART Buildbot
-# and Golem have full support for the Runtime APEX.
+# TODO(b/129332183): Remove this when Golem has full support for the
+# Runtime APEX.
 
 # Also include:
 # - a copy of the ICU prebuilt .dat file in /system/etc/icu on target
@@ -608,6 +608,9 @@
 # to "/system" on device. This is a temporary change needed
 # until Golem fully supports the Runtime APEX.
 #
+# TODO(b/129332183): Remove this when Golem has full support for the
+# Runtime APEX.
+
 # Also include:
 # - a copy of the time zone data prebuilt files in
 #   /system/etc/tzdata_module/etc/tz and /system/etc/tzdata_module/etc/icu
@@ -618,10 +621,10 @@
 # by setting the environment variable `ART_TEST_ANDROID_TZDATA_ROOT`
 # to "/system/etc/tzdata_module" on device. This is a temporary change needed
 # until Golem fully supports the Time Zone Data APEX.
-
 #
-# TODO(b/121117762, b/129332183): Remove this when the ART Buildbot
-# and Golem have full support for the Runtime APEX.
+# TODO(b/129332183): Remove this when Golem has full support for the
+# Runtime APEX (and TZ Data APEX).
+
 ART_TARGET_SHARED_LIBRARY_BENCHMARK := $(TARGET_OUT_SHARED_LIBRARIES)/libartbenchmark.so
 build-art-target-golem: dex2oat dalvikvm linker libstdc++ \
                         $(TARGET_OUT_EXECUTABLES)/art \
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 1583aae..8034956 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -91,16 +91,6 @@
   # - from /system/bin/linker(64) to /apex/com.android.runtime/bin/linker(64); and
   # - from /system/lib(64)/$lib to /apex/com.android.runtime/lib(64)/$lib.
   make_command+=" linker libc.bootstrap libdl.bootstrap libm.bootstrap"
-  # Create a copy of the time zone data module prebuilt time zone data files in
-  # /system/etc/tzdata_module/etc on target, so that they can be found even if
-  # the Time Zone Data APEX is not available, by setting the environment
-  # variable `ART_TEST_ANDROID_TZDATA_ROOT` to "/system/etc/tzdata_module" on
-  # device. This is a temporary change needed until both the ART Buildbot and
-  # Golem fully support the Time Zone Data APEX.
-  #
-  # TODO(b/121117762, b/129332183): Remove this when the ART Buildbot and Golem
-  # have full support for the Time Zone Data APEX.
-  make_command+=" icu_overlay-art-test-tzdata tzdata-art-test-tzdata tzlookup.xml-art-test-tzdata tz_version-art-test-tzdata"
   # Build the Time Zone Data APEX.
   make_command+=" com.android.tzdata"
   mode_suffix="-target"