Early changes that can be merged before we move to zope4.
This will create a new commit in order to revert the existing changes.