This fixes #8311.  Now almost everything is built locally in the project.