Revert last change (which removed old commented-out version of expand-file-name). Add a comment that explains why this old version should not be removed.