Fix Scaled health.  Fixes BUKKIT-4127 and BUKKIT-4432