reverted config refactoring