JENKINS-21035

3rd try