88c23ada9a
This reverts commit 3c3523c15850f3c42de35ae725288368414e4e91. Keeping the directory structure the same as before fixes the failures. They trivially reproduced locally and only passed before because I was not cleaning up the temp test directory in between invocations.