diff --git a/execdriver/chroot/driver.go b/execdriver/chroot/driver.go
index 509a62dd65..4b2e02904e 100644
--- a/execdriver/chroot/driver.go
+++ b/execdriver/chroot/driver.go
@@ -74,7 +74,7 @@ func (d *driver) Kill(p *execdriver.Command, sig int) error {
 	return p.Process.Kill()
 }
 
-func (d *driver) Wait(id string) error {
+func (d *driver) Restore(c *execdriver.Command) error {
 	panic("Not Implemented")
 }
 
diff --git a/execdriver/driver.go b/execdriver/driver.go
index c2fd526ed4..511e9e80c6 100644
--- a/execdriver/driver.go
+++ b/execdriver/driver.go
@@ -61,9 +61,9 @@ type Info interface {
 type Driver interface {
 	Run(c *Command, startCallback StartCallback) (int, error) // Run executes the process and blocks until the process exits and returns the exit code
 	Kill(c *Command, sig int) error
-	Restore(id string) (*Command, error) // Wait and try to re-attach on an out of process...process (lxc ghosts)
-	Name() string                        // Driver name
-	Info(id string) Info                 // "temporary" hack (until we move state from core to plugins)
+	Restore(c *Command) error // Wait and try to re-attach on an out of process command
+	Name() string             // Driver name
+	Info(id string) Info      // "temporary" hack (until we move state from core to plugins)
 }
 
 // Network settings of the container
diff --git a/execdriver/lxc/driver.go b/execdriver/lxc/driver.go
index 97c8a4b026..fbef616230 100644
--- a/execdriver/lxc/driver.go
+++ b/execdriver/lxc/driver.go
@@ -176,9 +176,9 @@ func (d *driver) Kill(c *execdriver.Command, sig int) error {
 	return d.kill(c, sig)
 }
 
-func (d *driver) Wait(id string) error {
+func (d *driver) Restore(c *execdriver.Command) error {
 	for {
-		output, err := exec.Command("lxc-info", "-n", id).CombinedOutput()
+		output, err := exec.Command("lxc-info", "-n", c.ID).CombinedOutput()
 		if err != nil {
 			return err
 		}