Adding back the config provider stuff