b6348c932b
The Travis CI Xcode 8.3 image uses macOS 10.12, where some OS and Xcode components were changed. This commit finally fixes macOS deployments on Travis for Xcode 8.3. This commit also reverts a few changes that got into master while we were trying to fix this.