Fix for JENKINS-26160

This should fix JENKINS-26160