Add back packaging information, lost in a merge