Undid refactor, they broke ServerProviders