Revert "Slimmer package"

This reverts commit ccd62ac417ffd22415844087a73ff4904c57bbcc.