d40820af47
Revert "Tidy config/hostconfig structures" Upstream-commit: fa210a01be7927e8332c20da0770de0d855caf51 Component: engine