Reformat to keep up with repackaging