I now removed the code altogether, see next commit.