Reverted to xcodebuild workaround