JENKINS-23289

Fix for [JENKINS-23289](https://issues.jenkins-ci.org/browse/JENKINS-23289).