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

This reverts commit aff56c4f274935c6a5d6372002d98b3067e679fd, reversing
changes made to f0c6b1903c94471e3b8a26c5f7cfcc3fd2033154.