2b18d5a2e4
This reverts commit e18598e316e824795e752e7bb1c90ee37dc1cc6f, reversing changes made to fd6ac0788bf3ade982e60ede7ceda26b0c0e598e. This pull request introduces two test failures. See http://jenkins.plone.org/job/plone-5.0-python-2.7/lastCompletedBuild/testReport/ for details.