Update the hack to work-around JENKINS-22247