CPack: revert part of previous commit