diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js
index bd5adb968..9b164f2f4 100755
--- a/platform/darwin/scripts/generate-style-code.js
+++ b/platform/darwin/scripts/generate-style-code.js
@@ -15,11 +15,6 @@ const suffix = 'StyleLayer';
 
 let spec = _.merge(require('../../../scripts/style-spec'), require('./style-spec-overrides-v8.json'));
 
-// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008
-delete spec.layout_circle["circle-sort-key"]
-delete spec.layout_line["line-sort-key"]
-delete spec.layout_fill["fill-sort-key"]
-
 class ConventionOverride {
     constructor(val) {
         if (typeof val === 'string') {
diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js
index 0aedba909..40818500f 100755
--- a/scripts/generate-style-code.js
+++ b/scripts/generate-style-code.js
@@ -6,11 +6,6 @@ const ejs = require('ejs');
 const spec = require('./style-spec');
 const colorParser = require('csscolorparser');
 
-// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008
-delete spec.layout_circle["circle-sort-key"]
-delete spec.layout_line["line-sort-key"]
-delete spec.layout_fill["fill-sort-key"]
-
 require('./style-code');
 
 function parseCSSColor(str) {
diff --git a/scripts/style-spec.js b/scripts/style-spec.js
index 8a9c9d414..374c3bcb6 100644
--- a/scripts/style-spec.js
+++ b/scripts/style-spec.js
@@ -1 +1,4 @@
-var spec = module.exports = require('../mapbox-gl-js/src/style-spec/reference/v8');
+var spec = module.exports = require('../vendor/mapbox-gl-native/mapbox-gl-js/src/style-spec/reference/v8');
+
+// FIXME: https://github.com/mapbox/mapbox-gl-native/issues/15008
+delete spec.layout_circle["circle-sort-key"];