This rids of circular deps and running @preserved-rebuild (which currently doesn't work but will in the next commit).