Revert "Remove incorrect or unnecessary relativePaths"