diff --git a/CHANGES b/CHANGES
index 662106db0f..1cee1334fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+6352.	[bug]		Revert change 6319 and decrease lock contention during
+			RBTDB tree pruning by not cleaning up nodes recursively
+			within a single prune_tree() call. [GL #4596]
+
 6350.	[bug]		Address use after free in expire_lru_headers. [GL #4495]
 
 	--- 9.18.24 released ---
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 16e6a84f35..cd16ecdbec 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -41,6 +41,11 @@ Bug Fixes
   ISC would like to thank to Jinmei Tatuya from Infoblox for bringing
   this issue to our attention.
 
+- A regression in cache-cleaning code enabled memory use to grow
+  significantly more quickly than before, until the configured
+  :any:`max-cache-size` limit was reached. This has been fixed.
+  :gl:`#4596`
+
 
 Known Issues
 ~~~~~~~~~~~~