Revert "Remove some patches"

Reverts plone/Products.CMFPlone#272