Fix for JENKINS-24999