diff --git a/proxy/proxy.go b/proxy/proxy.go
index d8b3cad6..a2360d64 100644
--- a/proxy/proxy.go
+++ b/proxy/proxy.go
@@ -119,10 +119,6 @@ func (proxy *Proxy) attachWithRetry(id string) {
 	proxy.attachJobs[id] = j
 }
 
-func (proxy *Proxy) attachAndKillOnFailure(id string) {
-	proxy.notifyWaiters(id, proxy.attach(id, true))
-}
-
 func (j attachJob) Stop() {
 	j.timer.Stop()
 }
@@ -388,7 +384,7 @@ func (proxy *Proxy) listen(protoAndAddr string) (net.Listener, string, error) {
 
 // weavedocker.ContainerObserver interface
 func (proxy *Proxy) ContainerStarted(ident string) {
-	proxy.attachAndKillOnFailure(ident)
+	proxy.notifyWaiters(ident, proxy.attach(ident, true))
 }
 
 func containerShouldAttach(container *docker.Container) bool {