broken changes for xcode 4
Revert "broken changes for xcode 4"

This reverts commit 9feb10a8165a4565483c25d97b6f799937ff6c20.