Fixed JENKINS-25342
Ammending fix to JENKINS-25342