Another attempt to get rid of path information.