The existing code only lazy loaded the service when the feature was disabled, now it makes the necessary checks in the methods.