Revert "un do a few of packages"

This reverts commit 9c8dca44bf328dcb16aac18832f47f788ee6e4ea.