Reproduce JENKINS-17713

To be merged after a fix for https://issues.jenkins-ci.org/browse/JENKINS-17713 gets released