diff --git a/update_chroot b/update_chroot
index 07c561f385..99b04e8853 100755
--- a/update_chroot
+++ b/update_chroot
@@ -35,6 +35,13 @@ set -e
 # Run version hooks as pre-update
 ${SCRIPTS_DIR}/run_chroot_version_hooks
 
+PREBUILT_SETUP="/etc/make.conf.prebuilt_setup"
+if [[ -n "$IGNORE_PREFLIGHT_BINHOST" ]]; then
+  echo 'PORTAGE_BINHOST="$FULL_BINHOST"' | sudo_clobber "$PREBUILT_SETUP"
+elif [[ -s "$PREBUILT_SETUP" ]]; then
+  sudo_clobber "$PREBUILT_SETUP" < /dev/null
+fi
+
 info "Updating chroot"
 
 EMERGE_FLAGS="-uNv --with-bdeps=y"