Revert "Revert "Make sure we extract if the package is there but not extracted - relates to #166""

This reverts commit 6751472a1812ac56f97312e8494ab7b1936ff1a7.
Make sure we extract if the package is there but not extracted - relates to #166