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