This will probably conflict with the real patch to rework this code, and
in such case this commit should be discarded in favor of the other
commit.