Fixes https://project.nexedi.net/#/bug_module/20210907-1D56198
This will create a new commit in order to revert the existing changes.
