Revert "More Path replacements"

This reverts commit 45cd37f5ef610f5f39c73d153c4ed481798e8ee8.
8 files changed