Final fix for JENKINS-19658