We go out of our way (see top of file) to build a single binary with symlinks for all of the tools, but were losing them when preparing the bootstrap tools.