Partially revert fc669aae647240cdd1e6b799b605c6dcd244a124. Retrack important repos.