Merge pull request #17838 from calavera/revert_17579

Revert "Tidy config/hostconfig structures"