Reverting 4ade2ba7df, cb96d23252, 329609c. JENKINS-17715 is not a candidate for 1.509 LTS