This partly reverts commit 9b43e81dd9. Some of these packages were in the repo, revert things for those.
9b43e81dd9