using ERP5: erp5!1545 (merged)
This will create a new commit in order to revert the existing changes.