Fix JENKINS-17733

Fixes https://issues.jenkins-ci.org/browse/JENKINS-17733