Revert "Try to workaround Jenkins/Maven packaging issue"

This reverts commit 443d64f7da3811b94e0c41c7cd4a79786c289ba2.
Revert "Revert - no help"

This reverts commit 9ad5a7e4f7cdb50b830376404b64bcf445ed580c.
Revert "Test to try to fix jenkins f-up"

This reverts commit 3483b19cef93edbd9f42c7c0413fc7e20a6ebff0.