diff --git a/build_slider.sh b/build_slider.sh
index 33a197476774..db7b49e48eea 100755
--- a/build_slider.sh
+++ b/build_slider.sh
@@ -97,16 +97,18 @@ if [ "${BUILD_KERNEL}" = "0" ]; then
 fi
 
 if [ "${EXPERIMENTAL_BUILD}" = "0" -a "${BUILD_KERNEL}" != "0" ]; then
+  MANIFEST_SHA=$(cat .repo/manifests/default.xml | grep "path=\"aosp\"" |
+		     sed -n "s/^.*revision=\"\([0-9a-fA-F]*\)\".*/\1/p")
   pushd aosp/ > /dev/null
     # Booting AOSP ToT does not always work; throw a warning to prevent this.
-    REPO_SHA=$(git log -1 --pretty="format:%H" m/s-dev-gs-pixel-5.10)
     LOCAL_MERGE_BASE=$(git merge-base HEAD aosp/android12-5.10)
-    if [ -n "${LOCAL_MERGE_BASE}" -a "${REPO_SHA}" != "${LOCAL_MERGE_BASE}" ]; then
+    if [ -n "${LOCAL_MERGE_BASE}" -a \
+	    "${MANIFEST_SHA}" != "${LOCAL_MERGE_BASE}" ]; then
       echo "Your aosp/ directory appears to be synced to a point beyond the"
       echo "  latest AOSP merge point. This is not supported, currently, as"
-      echo "  it is prone to errors. Please base any changes on"
-      echo "  m/s-dev-gs-pixel-5.10."
-      exit_if_error 1 "aosp/ is not based on m/s-dev-gs-pixel-5.10"
+      echo "  it is prone to errors. Please base any changes on the latest"
+      echo "  merge point as specified in the manifest."
+      exit_if_error 1 "aosp/ is not based on latest merge point"
     fi
   popd > /dev/null
 fi