Remove class PathUtils and add the orginal methods to SystemUtils.