Revert "Made even more health fixes"

This reverts commit 6a316db5da764351b39eab1f68202cc729de9747.
Revert "Make even more health changes"

This reverts commit db99e388f1d02bf5096472ff132af1a81feb50a4.