[Contants] Restore build settings as they create issues with Xcode 4

Partially reverts 9ab650d89