Fix a regression after serveral changes to directory structures.