JENKINS-22750 was actually fixed in 1.565