Fix reopen JENKINS-16316