Fix JENKINS-21067 by jumping hoops