Restored Plone 3.3 compatibility