[JENKINS-21785] Fix for PR 70 / aabd40a