Bugfix: Let's try not looping but using -currentHost instead

--------------------------------------------------------------------------------
Change-Id:     I3e2b14cfcfb2badbbf34bfd0f384d92c689f4e33
Signed-off-by: Jeff Felchner <accounts+git@thekompanee.com>