Fix for JENKINS-14725