diff --git a/pkg/volume/csi/csi_mounter.go b/pkg/volume/csi/csi_mounter.go
index f96e93ce512..7e98dea45ca 100644
--- a/pkg/volume/csi/csi_mounter.go
+++ b/pkg/volume/csi/csi_mounter.go
@@ -365,7 +365,11 @@ func (c *csiMountMgr) TearDownAt(dir string) error {
 		return errors.New(log("mounter.TearDownAt failed: %v", err))
 	}
 
-	// clean mount point dir
+	// Deprecation: Removal of target_path provided in the NodePublish RPC call
+	// (in this case location `dir`) MUST be done by the CSI plugin according
+	// to the spec. This will no longer be done directly as part of TearDown
+	// by the kubelet in the future. Kubelet will only be responsible for
+	// removal of json data files it creates and parent directories.
 	if err := removeMountDir(c.plugin, dir); err != nil {
 		return errors.New(log("mounter.TearDownAt failed to clean mount dir [%s]: %v", dir, err))
 	}