diff --git a/cmd/podman/containers/restore.go b/cmd/podman/containers/restore.go
index 144925a54d..d094ac2469 100644
--- a/cmd/podman/containers/restore.go
+++ b/cmd/podman/containers/restore.go
@@ -93,7 +93,7 @@ func init() {
 
 func restore(cmd *cobra.Command, args []string) error {
 	var (
-		err  error
+		e    error
 		errs utils.OutputErrors
 	)
 	podmanStart := time.Now()
@@ -104,9 +104,9 @@ func restore(cmd *cobra.Command, args []string) error {
 	// Check if the container exists (#15055)
 	exists := &entities.BoolReport{Value: false}
 	for _, ctr := range args {
-		exists, err = registry.ContainerEngine().ContainerExists(registry.GetContext(), ctr, entities.ContainerExistsOptions{})
-		if err != nil {
-			return err
+		exists, e = registry.ContainerEngine().ContainerExists(registry.GetContext(), ctr, entities.ContainerExistsOptions{})
+		if e != nil {
+			return e
 		}
 		if exists.Value {
 			break
@@ -115,9 +115,9 @@ func restore(cmd *cobra.Command, args []string) error {
 
 	if !exists.Value {
 		// Find out if this is an image
-		restoreOptions.CheckpointImage, err = utils.IsCheckpointImage(context.Background(), args)
-		if err != nil {
-			return err
+		restoreOptions.CheckpointImage, e = utils.IsCheckpointImage(context.Background(), args)
+		if e != nil {
+			return e
 		}
 	}
 
diff --git a/cmd/podman/containers/run.go b/cmd/podman/containers/run.go
index d8d020c635..f66d4d4d34 100644
--- a/cmd/podman/containers/run.go
+++ b/cmd/podman/containers/run.go
@@ -148,35 +148,6 @@ func run(cmd *cobra.Command, args []string) error {
 		imageName = name
 	}
 
-	// If this is a checkpoint image, invoke container restore.
-	// We do not return `err` when checkpointImage is false, because the value
-	// of `err` could be "image is not a checkpoint". In this case, the run
-	// command should continue as usual, preserving backwards compatibility.
-	checkpointImage, err := utils.IsCheckpointImage(registry.GetContext(), []string{imageName})
-	if checkpointImage {
-		if err != nil {
-			return err
-		}
-		var restoreOptions entities.RestoreOptions
-		responses, err := registry.ContainerEngine().ContainerRestore(registry.GetContext(), []string{imageName}, restoreOptions)
-		if err != nil {
-			return err
-		}
-
-		var errs utils.OutputErrors
-		for _, r := range responses {
-			switch {
-			case r.Err != nil:
-				errs = append(errs, r.Err)
-			case r.RawInput != "":
-				fmt.Println(r.RawInput)
-			default:
-				fmt.Println(r.Id)
-			}
-		}
-		return errs.PrintErrors()
-	}
-
 	if cliVals.Replace {
 		if err := replaceContainer(cliVals.Name); err != nil {
 			return err