Revert " IZPACK-1169"

This reverts commit 303812c75568a502b3f5f0a344dca02b4e74e5c4.
 IZPACK-1169