[JENKINS-16974] 3c01366 was backported as eff76c7 but the merge conflict was incorrectly resolved.