Fix JENKINS-21883