Merge 13a98df4 (automated)

1 files changed, 1 insertions, 4 deletions

diff --git a/runsc/boot/controller.go b/runsc/boot/controller.go
index 0285f599d..72cbabd16 100644
--- a/runsc/boot/controller.go
+++ b/runsc/boot/controller.go
@@ -379,13 +379,10 @@ func (cm *containerManager) Restore(o *RestoreOpts, _ *struct{}) error {
 
 	// Load the state.
 	loadOpts := state.LoadOpts{Source: specFile}
-	if err := loadOpts.Load(k, networkStack); err != nil {
+	if err := loadOpts.Load(k, networkStack, time.NewCalibratedClocks()); err != nil {
 		return err
 	}
 
-	// Set timekeeper.
-	k.Timekeeper().SetClocks(time.NewCalibratedClocks())
-
 	// Since we have a new kernel we also must make a new watchdog.
 	dog := watchdog.New(k, watchdog.DefaultTimeout, cm.l.conf.WatchdogAction)