Final fix for JENKINS-23246