Revert "Merge branch 'revert-carthage' into update-tracking-branch"

This reverts commit 969fe879e14ecff2be6407d59365c19cfd27c420, reversing
changes made to 8049d3766a9e695ed4bdcf49eb0fb331218f63ee.