Fix for JENKINS-12840