This turned out to be insufficient by itself, because we would also need to export config.guess. This reverts commit 4ac4d6bc.
