Revert "Merge branch 'master' into deploy-to-testflight"

This reverts commit e8a5533b1971cd08984ad30142669b78651aca18, reversing
changes made to 945939213c815950f1b61b84989aa48085415564.