JENKINS-22028 was only fixed in 1.565