Revert "Merge branch '4.3.x' of github.com:plone/Products.CMFPlone into ...

...4.3.x"

This reverts commit 0d02bef3fa49d88d3b8d2a1b7a2629bdd8df39c3, reversing
changes made to e20ea907d2854ee7ad41e9953b64889ee7431b49.