Switch to regexp-based matching for host wait time