Restore path.join to reduce noise in changes