Revert "Rollup merge of rust-lang#58162 - pietroalbini:track-259, r=alexcrichton"

This reverts commit 4c243e2, reversing
changes made to 64f0032.

Author: pietroalbini

appveyor.yml

@@ -207,10 +207,7 @@ test_script:
   - sh src/ci/init_repo.sh . /c/cache/rustsrc
   - set SRC=.
   - set NO_CCACHE=1
-  # Added this debugging code to try tracking down https://github.com/rust-lang/rust/issues/58160
-  # Replace it with the commented line below after the issue with AppVeyor is fixed
-  - "sh src/ci/run.sh & set ret=%errorlevel% & echo exit code in appveyor.yml: %ret% & exit %ret%"
-#  - sh src/ci/run.sh
+  - sh src/ci/run.sh
 
 on_failure:
   # Dump crash log

src/ci/run.sh

@@ -127,13 +127,7 @@ if [ ! -z "$SCRIPT" ]; then
   set +e
   sh -x -c "$SCRIPT"
   ret=$?
-  echo "exit code in src/ci/run.sh: $ret"
-
-  echo "tasklist:"
-  tasklist
-  echo -n "location of sh: "
-  where sh
-
+  echo "script exited with $ret"
   exit $ret
 else
   do_make() {