Revert package fix and update copyright