Revert backport of JENKINS-18776 (sometimes incorrectly refered to as JENKINS-18771)

This reverts commit f43b3cd655bd96e461649fee1e9b5ee1b5abf87a.
This reverts commit 72cea1ad5d70ed75f7d258c770f61be4ea6cb06b.
This reverts commit 01445f44e7d08ce66d443d08649ea09950175b70.
This reverts commit ce08bdf5fa5da0db0a8123857cae2cdb931f16df.
This reverts commit 448e580a3605d07599508a46e03789baa8c9308c.
This reverts commit 381ab039fa1da7d57a4ed22c4e78db2a6de34c98.