Backed out some path changes.