After that symlink SNAFU, I don't remember what these changes are.