Fix https://issues.jenkins-ci.org/browse/JENKINS-16042