🔧 Drop containerd workaround

Partly reverts
37cc186c0b,
but re-enable test.

pkg/api/core/image/delta_test.go

@@ -78,6 +78,9 @@ var _ = Describe("Delta", func() {
 				)
 				Expect(err).ToNot(HaveOccurred())
 				defer os.RemoveAll(tmpdir) // clean up
+
+				// No extra dirs are present
+				Expect(file.Exists(filepath.Join(tmpdir, "home"))).To(BeFalse())
 				// Cache from go
 				Expect(file.Exists(filepath.Join(tmpdir, "root", ".cache"))).To(BeTrue())
 				// sh is present from alpine, hence not in the result

pkg/api/core/image/extract.go

@@ -65,12 +65,7 @@ func ExtractDeltaAdditionsFiles(
 			return nil, err
 		}
 
-		switch hdr.Typeflag {
-		case tar.TypeDir:
-			filesSrc.Set(filepath.Dir(hdr.Name), "")
-		default:
-			filesSrc.Set(hdr.Name, "")
-		}
+		filesSrc.Set(hdr.Name, "")
 	}
 
 	return func(h *tar.Header) (bool, error) {