Simplify

1 files changed, 2 insertions, 7 deletions

diff --git a/client/go/internal/cli/cmd/waiter.go b/client/go/internal/cli/cmd/waiter.go
index 1dc227cd683..40d1d76518e 100644
--- a/client/go/internal/cli/cmd/waiter.go
+++ b/client/go/internal/cli/cmd/waiter.go
@@ -27,13 +27,8 @@ func (w *Waiter) DeployService(target vespa.Target) (*vespa.Service, error) {
 	if err != nil {
 		return nil, err
 	}
-	if w.Timeout > 0 {
-		w.cli.printInfo("Waiting up to ", color.CyanString(w.Timeout.String()), " for ", s.Description(), " to become ready...")
-	}
-	if w.wait() {
-		if err := s.Wait(w.Timeout); err != nil {
-			return nil, err
-		}
+	if err := w.maybeWaitFor(s); err != nil {
+		return nil, err
 	}
 	return s, nil
 }