Revert "Update for new package repo"

This reverts commit f3ad903d09aa12e86b513e5b36357a20eae643d1.