Revert "Repackaging"

This reverts commit ceb1c9e656d93d3a36ddcfb326695dafc58f526b.