Remove hotfix since it breaks newer Plone releases