Prepare for https://github.com/zopefoundation/Zope/pull/1075 ( Zope 4.8.7 )
This will create a new commit in order to revert the existing changes.
