Revert "Improved packaging method"

This reverts commit b0dfb82ec7431f0f98e8a90b3c64f123bca21da0.