diff --git a/weave b/weave
index e9621d7e..f6adf7ee 100755
--- a/weave
+++ b/weave
@@ -573,10 +573,6 @@ attach() {
 # functions for interacting with containers
 ######################################################################
 
-kill_container() {
-    util_op kill-container $1 >/dev/null 2>&1 || true
-}
-
 # Print an error to stderr and return with an indicative exit status
 # if the container $1 does not exist or isn't running.
 check_running() {
@@ -669,7 +665,8 @@ wait_for_status() {
     while true ; do
         "$@" GET /status >/dev/null 2>&1 && return 0
         if ! check_running $container >/dev/null 2>&1 ; then
-            kill_container $container # stop it restarting
+            # stop it restarting
+            util_op kill-container $container >/dev/null 2>&1 || true
             echo $(death_msg $container) >&2
             return 1
         fi