7554724a36
This reverts commit 45584b3e5a.
These work fine now that we have an up-to-date bootstrap tarball for
this platform.