diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index 742116e4ac..25a59225bc 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -39,7 +39,7 @@ delete_prompt() {
 
   # Only prompt if both stdin and stdout are a tty. If either is not a tty,
   # then the user may not be present, so we shouldn't bother prompting.
-  if [ -t 0 -a -t 1 -a "${USER}" != 'chrome-bot' ]; then
+  if [ -t 0 -a -t 1 ]; then
     read -p "Would you like to delete the output directory (y/N)? " SURE
     SURE="${SURE:0:1}" # Get just the first character.
   else
diff --git a/sdk_lib/make_chroot.sh b/sdk_lib/make_chroot.sh
index 60ed1edcba..0146e9d6da 100755
--- a/sdk_lib/make_chroot.sh
+++ b/sdk_lib/make_chroot.sh
@@ -244,11 +244,6 @@ EOF
    echo ". ~/trunk/src/scripts/bash_completion" \
        | user_append "$FLAGS_chroot/home/${SUDO_USER}/.bashrc"
 
-   if [[ "${SUDO_USER}" = "chrome-bot" ]]; then
-     # Copy ssh keys, so chroot'd chrome-bot can scp files from chrome-web.
-     cp -rp ~/.ssh "$FLAGS_chroot/home/${SUDO_USER}/"
-   fi
-
    if [[ -f ${SUDO_HOME}/.gitconfig ]]; then
      # Copy .gitconfig into chroot so repo and git can be used from inside.
      # This is required for repo to work since it validates the email address.