Revert "Fix for Orbwalker/Health Prediction"

This reverts commit 31aa347c4700f2859817bfaec67fcd8c5e384b5a.