This depends on erp5!1538 (merged)
This will create a new commit in order to revert the existing changes.