Revert "Make repos.list work nicer, fix a dep bug"

Do it the old way so that cruft doesn't get written to the file.