Refix JENKINS-16975