Revert change for resolve_hosts after #2415