Starting to fix links between defunct things. Yes, I know this will break the build.