Use filepath rather than our own System.Directory.Internals