Revert "Merge remote-tracking branch 'upstream/ios' into ios"

This reverts commit 14e13f46ab7e25616a7a5e0bef73291672d60c01, reversing
changes made to 00e797e7c533fb7bedd32492503c77b2d6f09974.