Fix Hot-Spares causing CRITICAL

Fixes #75. This is a minimal forward port of the patch against 3.0.5 we are using in our environment.