re-apply "Revert "Use relative path.""