updating to latest upstream and removing config module to instead leverage the provider.