Fix [JENKINS-25636]