Apply last chunk of Jan's xcode patches.
I misread, it is needed after all.
1 file changed