Add some code removed by mistake from commit 182722 that works around a file