Restore Xcode 4 support