Forward-port of https://github.com/odoo/odoo/commit/6f14b488fb380c6a3f1b7361b9901de3f07fd9ea was not properly done.