Revered some of the original path changes.