Move my previous commit into correct location (not Plone 3)