Revert "Changed file path handling to generic"

This reverts commit b7a57553b3f0452616b3ba4e1fb7ae314ae9fd44.