Revert "rely on host to config"

This reverts commit e4c6d0c79cb415a2d9534ac096a8cf7c205b7745.
Merge branch 'master' into travel
restore relying on host to config in branch only