Restore compatibility with Xcode 4

Partially reverts c68a4b2