Reverted a bunch of packaging changes.