Revert "Merge pull request #187 from jenkinsci/JENKINS-14026"

This reverts commit a67bbc0062fa4dd4d27b8113f3a27840b53dded9, reversing
changes made to b75d1e21dc75c8143f99baea0342169123a409c8.
Revert "Merge branch 'release'"

This reverts commit b75d1e21dc75c8143f99baea0342169123a409c8, reversing
changes made to d267bd6b16fc8d2d9c04b27a9ed805082592bab3.