Revert part of my pkg2 WIP that accidentally made it into the last commit