User Header Search Paths Modified When Auto-importing Class/Header

So, I have strange issue. It's also really annoying and shouldn't be happening.

The issue is that I have my header search paths set to how they need to be. They have been set up since the beginning of my project. So, the compiler finds everything it needs. But, now AppCode is modifying my build settings when auto-importing a file.  This seems to be part of the lastest build OC-121.35.  

Here is the scenario:

I am using a framework called RestKit in my project. The project is part of my workspace and the code is also there. For example, my header search path (not USER header search path) is set as:

"$(BUILT_PRODUCTS_DIR)/../../Headers":"$(SOURCE_ROOT)/../passcodelock/PasscodeLock"

That is all good. But, I was editing a class and wanted to use a class called RKRequestSerialization.  So, I typed in the name and the auto-import dialog popped up asking if I wanted to import it. I say "yes".  But, instaed of including the file like this:

#import "RestKit/RKRequestSerialization.h"

It did two things badly. First it wrote this:

#import "RKRequestSerialization.h"

Then it did the horrible thing of adding these lines to my project file, here is a diff so you can see what was modified:

@@ -2499,6 +2485,7 @@

 PROVISIONING_PROFILE = "";

 "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";

 SKIP_INSTALL = NO;

+ USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../RestKit\"/**";

 WRAPPER_EXTENSION = app;

 };

 name = Debug;

@@ -2524,6 +2511,7 @@

 PRODUCT_NAME = "$(TARGET_NAME)";

 PROVISIONING_PROFILE = "";

 SKIP_INSTALL = NO;

+ USER_HEADER_SEARCH_PATHS = "\"${PROJECT_DIR}/../RestKit\"/**";

 WRAPPER_EXTENSION = app;

 };