Fix wait_for_hs bug when specifying --local-only