Revert "Revert "Fix for Orbwalker/Health Prediction""

This reverts commit 113b3c5e797e06e1e478e44e7b79d903af92b958.