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