[FIXED JENKINS-22568] Backwards compatible fix.