diff --git a/chroot_version_hooks.d/34_arm_softfp_to_hardfp b/chroot_version_hooks.d/34_arm_softfp_to_hardfp
index 1896ec868d..e3a2db61cf 100644
--- a/chroot_version_hooks.d/34_arm_softfp_to_hardfp
+++ b/chroot_version_hooks.d/34_arm_softfp_to_hardfp
@@ -19,27 +19,8 @@ for ldso in /build/*/lib/ld-linux.so.3; do
     info "sudo rm -rf ${build}.softfp"
     sudo mv ${build}{,.softfp}
     info "Running setup_board --board=${board}"
-    # We run with nousepkg for people who have an old toolchain
-    # and haven't upgraded to the hardfp one yet.  This might
-    # add a little overhead once, but we need this to recover
-    # the builders because they can't produce toolchain binpkgs
-    # until they've upgraded themselves.
-    # Once people's toolchain is up-to-date, this won't cause
-    # any real overhead.
     ~/trunk/src/scripts/setup_board \
-      --nousepkg \
       --board=${board} \
       --skip_chroot_upgrade
   fi
 done
-
-# Make sure we have a gcc version that was built with USE=hardfp.
-if ! portageq has_version / 'cross-armv7a-cros-linux-gnueabi/gcc[hardfp]'; then
-  info "Making sure your arm toolchain is up-to-date"
-  info "by installing an arm-generic board"
-  ~/trunk/src/scripts/setup_board \
-    --nousepkg \
-    --force \
-    --board=arm-generic \
-    --skip_chroot_upgrade
-fi