This fixes bug https://project.nexedi.net/#/bug_module/20210603-1C66F4F
This will create a new commit in order to revert the existing changes.
