Revert "Merge branch 'master' of git://github.com/plone/Products.CMFPlone"

This reverts commit 1102c3bfbde187fe4ee66083704778516b9d0110, reversing
changes made to 19a7b285441471793b0e141191db91bf8944491e.