Revert "Disable config"

This reverts commit 2f10b8b48cfb95031a94887a069982aa9d8e060f.
Service provider refactor