Revert host elicitation (pre-v1.17.0 behaviour) (#802)