Final fix for JENKINS-23920