Revert "Merge remote-tracking branch 'upstream/master' into 903039-native-options"

This reverts commit a56a30740ed7a16210c2cdb628b007e75279af83, reversing
changes made to c9f3cfdfa344450ba83020d935f46691e68495aa.