Revert "Backported the fix described in 240bff618acd1120c396a4012fcf9002b11065bc to the Health plugin"

This reverts commit 0976aae103f0fb74a52ee91f354db6ede95feed6.

Reverts backports in order to apply them to a newer version of the Health
plugin
Revert "Backported changes from a66aae630e54024a5e6a3b3db4f6f5806e353e9e to Health plugin"

This reverts commit 58e07664dc30145f59db8702b7f5c65c82fe0a08.

Reverted changes to use on a newer version of the health plugin