Fix JENKINS-16774