Replaces !1178 (closed) by a much simpler approach.
Needs erp5!1634 (merged) on ERP5 side
This will create a new commit in order to revert the existing changes.
