Revert "Merge branch 'xCode4'"

This reverts commit 7d32b95f3239041342337e3c6eb70ba03863d68e, reversing
changes made to d388d430deba5cd27e4120a23f16ab6df043908e.
Revert "add test commit"