Combat plone.app.dexterity changes