Merge "preupload: Depend on sourcing build/setup.sh"
diff --git a/install-prereqs.sh b/install-prereqs.sh
index 6dab5cb..54b8681 100755
--- a/install-prereqs.sh
+++ b/install-prereqs.sh
@@ -79,9 +79,7 @@
     python-is-python3
     python3-protobuf
     python3
-    python3.10
     python3-dev
-    python3.10-dev
     python3-pip
     rsync
     srecord
@@ -114,12 +112,6 @@
     sudo "$@" || die
 }
 
-function try_use_python3_10 {
-  echo "Update Python3 to use Python 3.10"
-  sudo_try ln -sf /usr/bin/python3.10 /usr/bin/python3
-  echo "Python version : $(python3 --version)"
-}
-
 function try_install_apt_packages {
     sudo_try apt-get update
     sudo_try apt-get install -y "${APT_PACKAGES[@]}"
@@ -127,9 +119,6 @@
     if [[ ! -z "${APT_REQUIREMENTS}" ]]; then
         sed 's/#.*//' "${APT_REQUIREMENTS}" | sudo_try xargs apt-get install -y
     fi
-
-    # Force python3 to use python3.10 (b/267082842)
-    python3 --version | grep "Python 3.10" || try_use_python3_10
 }
 
 function try_install_python_packages {
diff --git a/python-requirements.txt b/python-requirements.txt
index 24e6f1c..f65524e 100644
--- a/python-requirements.txt
+++ b/python-requirements.txt
@@ -2,7 +2,23 @@
 # TODO(jtgans): Remove this pinning once upstream is unborked.
 fixtures==4.0.0
 
-camkes-deps
+# TODO(hcindyl): Use camkes-deps 0.7.4 directly instead of explicitly installing
+# the depedency packages.
+aenum
+jinja2>=3.0.0
+ordered-set
+plyplus
+pyelftools
+sel4-deps
+pycparser
+pyfdt
+concurrencytest
+# capDL deps
+sortedcontainers
+hypothesis
+
+# camkes-deps
+
 hjson
 lit
 mako