Partial fix for JENKINS-22425, still needs license fix.