Reapply Michael's XCode 5.1 fix