Fix JENKINS-16789