JENKINS-21938:Revert for 0c8af5367fca40734d7b456078ef68b3c1f96f76