> What about the rest of the directory variables patch? Are those changes > acceptable if I remove the changes to the project files? Hard to tell without seeing a standalone patch of what you're proposing, but probably acceptable.