This commit is similar to r32811 and should fix regressions caused by r38601
for good.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@38635 20353a03-c40f-0410-a6d1-a30d3c3de9de