Fix for JENKINS-26160