Yet another try at fixing the build