diff --git a/tool/run-riscv64 b/tool/run-riscv64
index d9222a3b8..63f6aeb04 100755
--- a/tool/run-riscv64
+++ b/tool/run-riscv64
@@ -1,21 +1,5 @@
 #!/bin/bash
 
-THISDIR=$(cd "$(dirname "$0")";pwd)
+set -e
 
-# Execute RISC-V executable on Spike
-prefix=`${THISDIR}/find-riscv-toolchain` || exit 1
-pk="${RISCV}/${prefix}/bin/pk"
-
-# Eliminate "bbl loader" message
-first=1
-spike "$RISCV/$prefix/bin/pk" "$@" | while IFS= read LINE
-do
-  if [[ $first -eq 1 ]]; then
-    first=0
-    if [[ "$LINE" =~ bbl\ loader ]]; then
-      continue
-    fi
-  fi
-  echo "$LINE"
-done
-exit "${PIPESTATUS[0]}"
+spike pk "$@"