JENKINS-21035

2nd try