Relocated health check (de)activation call sites