[FIXED JENKINS-18236] Noting retroactively.