diff --git a/rust-toolchain b/rust-toolchain
index 238b1af4395..f8a3455b49b 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-01-18
+nightly-2020-01-25
diff --git a/rustup.sh b/rustup.sh
index e1b1bdc399d..afa7888cc0c 100755
--- a/rustup.sh
+++ b/rustup.sh
@@ -5,14 +5,14 @@ set -e
 case $1 in
     "prepare")
         # FIXME Automatically detect latest nightly
-        read -p "Date of nightly to use (aka yesterday GMT): " TOOLCHAIN
+        read -p "Date of nightly to use: " TOOLCHAIN
 
         echo "=> Installing new nightly"
         rustup toolchain install --profile minimal nightly-${TOOLCHAIN} # Sanity check to see if the nightly exists
         echo nightly-${TOOLCHAIN} > rust-toolchain
 
         echo "=> Uninstalling all old nighlies"
-        for nightly in $(rustup toolchain list | grep nightly- | grep -v $TOOLCHAIN); do
+        for nightly in $(rustup toolchain list | grep nightly | grep -v $TOOLCHAIN | grep -v nightly-x86_64); do
             rustup toolchain uninstall $nightly
         done