Backport unlimited JCE fix from trunk