Add a hack to work-around JENKINS-22247