As a workaround, I would also prefer to merge in #9439 temporarily than adding the files to gitignore (I don't want to have the rubbish piling up, even when it's ignored). We can always remove the edits into conftest once the issue gets fixed upstream.