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