Switch to BuildFallbackServiceProvider