Revert config cleanup. It does not work now but was fine before.