Got rid of the PathHolder.