diff --git a/CHANGES b/CHANGES
index 365a7143f0..d7500fecc3 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]
+
 6351.	[protocol]	Support for the RESINFO record type has been added.
 			[GL #4413]
 
diff --git a/doc/notes/notes-current.rst b/doc/notes/notes-current.rst
index 2705e7bc27..2e9582ddb2 100644
--- a/doc/notes/notes-current.rst
+++ b/doc/notes/notes-current.rst
@@ -70,6 +70,10 @@ 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
 ~~~~~~~~~~~~