This also removes the substitution code we added to the build scripts in one of the previous commits.
