diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd532bb4..a78a8416 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Refactored overlay class. #1968
 - `wwclient` places files from the runtime overlay atomically. #1307, #1975
 - `wwclient` skips files that do not appear to have been modified. #1984
+- `wwctl overlay edit` again writes temporary files to the default location.
+  (After #1886 better resolves the underlying issue from #1473.) #1946
 
 ### Fixed
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 7d75a19e..657d378a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -48,3 +48,4 @@
 * Rafael Lopez <raflopez1@gmail.com> @rafalop
 * Arian Cabrera [@acabrera86](https://github.com/acabrera86)
 * Dacian Reece-Stremtan <dacianstremtan@gmail.com> [@dacianstremtan](https://github.com/dacianstremtan)
+* Adrian Reber <areber@redhat.com>
diff --git a/internal/app/wwctl/overlay/edit/main.go b/internal/app/wwctl/overlay/edit/main.go
index 608d7ed4..3bcf3b32 100644
--- a/internal/app/wwctl/overlay/edit/main.go
+++ b/internal/app/wwctl/overlay/edit/main.go
@@ -47,7 +47,7 @@ func CobraRunE(cmd *cobra.Command, args []string) (err error) {
 		return fmt.Errorf("%s does not exist. Use '--parents' option to create automatically", overlayFileDir)
 	}
 
-	tempFile, tempFileErr := os.CreateTemp(myOverlay.Path(), "ww-overlay-edit-")
+	tempFile, tempFileErr := os.CreateTemp("", "ww-overlay-edit-")
 	if tempFileErr != nil {
 		return fmt.Errorf("unable to create temporary file for editing: %s", tempFileErr)
 	}