Revert "Health fixes"

This reverts commit f4d0d1ee943e83fe371589853ca8a25dd199760f.