From 0dc82e85014e113211f29815c82c9120179d1c50 Mon Sep 17 00:00:00 2001
From: Bruno Oliveira <bruno@esss.com.br>
Date: Mon, 20 Jan 2020 13:32:27 -0300
Subject: [PATCH] Add CHANGELOG entry for #6496

---
 changelog/6496.bugfix.rst | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 changelog/6496.bugfix.rst

diff --git a/changelog/6496.bugfix.rst b/changelog/6496.bugfix.rst
new file mode 100644
index 000000000..ff541f52f
--- /dev/null
+++ b/changelog/6496.bugfix.rst
@@ -0,0 +1,2 @@
+Revert `#6436 <https://github.com/pytest-dev/pytest/issues/6436>`__: unfortunately this change has caused a number of regressions in many suites,
+so the team decided to revert this change and make a new release while we continue to look for a solution.