Ammending JENKINS-25593