fixes JENKINS-21080