Fix proposal for JENKINS-16800