--- Products/txtfilter/field.py.orig	2008-07-24 08:45:03.000000000 -0400
+++ Products/txtfilter/field.py	2008-07-23 18:35:54.000000000 -0400
@@ -8,7 +8,6 @@
 __docformat__ = 'restructuredtext'
 
 from Products.Archetypes import public as atapi
-from Products.CMFCore import CMFCorePermissions
 from Products.CMFCore.utils import getToolByName
 from ZODB.POSException import ConflictError
 from AccessControl import ClassSecurityInfo
--- Products/txtfilter/filter.py.orig	2008-07-24 08:45:03.000000000 -0400
+++ Products/txtfilter/filter.py	2008-07-23 18:35:34.000000000 -0400
@@ -6,7 +6,6 @@
 from Products.Archetypes.debug import log as atlog
 from Products.Archetypes.config import REFERENCE_CATALOG
 from Products.txtfilter import config as config
-from Products.CMFCore import CMFCorePermissions
 from Products.CMFCore.utils import getToolByName, _getViewFor
 from ZODB.POSException import ConflictError
 
--- Products/txtfilter/__init__.py.orig	2008-07-24 08:45:03.000000000 -0400
+++ Products/txtfilter/__init__.py	2008-07-23 18:36:20.000000000 -0400
@@ -9,7 +9,7 @@
 from Extensions import Install
 del Install
 from Products.Archetypes import public as atapi
-from Products.CMFCore import CMFCorePermissions
+from Products.CMFCore.permissions import AddPortalContent
 from Products.CMFCore import utils as cmf_utils
 from Products.CMFCore.DirectoryView import registerDirectory
 
@@ -28,7 +28,7 @@
     cmf_utils.ContentInit(
         config.PROJECTNAME + ' Example Content',
         content_types      = content_types,
-        permission         = CMFCorePermissions.AddPortalContent,
+        permission         = AddPortalContent,
         extra_constructors = constructors,
         fti                = ftis,
         ).initialize(context)
--- Products/wicked/__init__.py.orig	2008-07-24 08:45:03.000000000 -0400
+++ Products/wicked/__init__.py	2008-07-23 18:35:03.000000000 -0400
@@ -10,7 +10,6 @@
 
 from Globals import package_home
 from Products.Archetypes import public as atapi
-from Products.CMFCore import CMFCorePermissions
 from Products.CMFCore import utils as cmf_utils
 import config
 import sys