Revert "Path cleanup"

This reverts commit b9ce071289cec0ed0b114498942482803678b914.