Fix for JENKINS-20025