Revert "Merge pull request #1 from plone/fix-13880"

This reverts commit 1d8abf8bfdd5e39578b3e7a9d9a0186d52a4bd2c, reversing
changes made to 18b5a8a6626575c0a9bbe77b986b667c3c5b247e.