[JENKINS-18629] Noting retroactively.