Removing the use of the obsoleted ICircuitBreaker