Fixed regression where CSI directory wasn't being created after old CSI directory moved away.