Revert "Changes to the health handler"

This reverts commit d2af29b3af7afbff0dd83b5d22eaf43143a59222.
Broke some stuff by accident so reverting.