Reverting repackage, moving that to a topic branch.

This reverts commit f2d0ee4e99b17779ff37dc77a69ee5b45c8f722f.