Revert "Clean up get_sample_dut()"

This reverts commit 73d77fa0919bee236f676e7d47908abbc6b22332.

Change-Id: Iba4d38be7422c071b83a39c97acf1bf8ba3619bb
Reviewed-on: https://chromium-review.googlesource.com/422498
Reviewed-by: Dan Shi <dshi@chromium.org>
Commit-Queue: Dan Shi <dshi@chromium.org>
Tested-by: Dan Shi <dshi@chromium.org>
diff --git a/frontend/afe/rpc_utils.py b/frontend/afe/rpc_utils.py
index a868b02..58fa4fb 100644
--- a/frontend/afe/rpc_utils.py
+++ b/frontend/afe/rpc_utils.py
@@ -1364,14 +1364,10 @@
     """
     if not (dev_server.PREFER_LOCAL_DEVSERVER and pool and board):
         return None
-    first_host = get_host_query(
-        multiple_labels=('pool:%s' % pool, 'board:%s' % board),
-        exclude_only_if_needed_labels=False,
-        exclude_atomic_group_hosts=False,
-        valid_only=True,
-        filter_data={},
-    ).first()
-    if first_host is None:
+
+    hosts = get_host_query(
+            ('pool:%s' % pool, 'board:%s' % board), False, False, True, {})
+    if not hosts:
         return None
-    else:
-        return first_host.hostname
+
+    return list(hosts)[0].get_object_dict()['hostname']