Revert "Merge pull request #1368 from zombie/903039-native-options"

This reverts commit c73d7c97183ddb2130f60849fda526e042d5d0eb, reversing
changes made to c49118aa60fcf959534e25f4eed45fd4504db316.