1 files changed, 0 insertions, 7 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go
index 011303349..b27409e4c 100644
--- a/cmd/podman/main.go
+++ b/cmd/podman/main.go
@@ -98,17 +98,11 @@ func main() {
 	}
 	app.After = func(*cli.Context) error {
 		// called by Run() when the command handler succeeds
-		shutdownStores()
 		if cpuProfile {
 			pprof.StopCPUProfile()
 		}
 		return nil
 	}
-	cli.OsExiter = func(code int) {
-		// called by Run() when the command fails, bypassing After()
-		shutdownStores()
-		os.Exit(code)
-	}
 	app.Flags = []cli.Flag{
 		cli.StringFlag{
 			Name:  "cni-config-dir",
@@ -158,6 +152,5 @@ func main() {
 		} else {
 			fmt.Fprintln(os.Stderr, err.Error())
 		}
-		cli.OsExiter(1)
 	}
 }