diff --git a/include/mbgl/style/types.hpp b/include/mbgl/style/types.hpp
index 628e0d239..13a2e50f0 100644
--- a/include/mbgl/style/types.hpp
+++ b/include/mbgl/style/types.hpp
@@ -70,6 +70,7 @@ enum class SymbolPlacementType : uint8_t {
 };
     
 enum class SymbolZOrderType : uint8_t {
+    Auto,
     ViewportY,
     Source
 };
diff --git a/scripts/style-spec.js b/scripts/style-spec.js
index b2686a6a7..19b7378cf 100644
--- a/scripts/style-spec.js
+++ b/scripts/style-spec.js
@@ -2,5 +2,3 @@ var spec = module.exports = require('../mapbox-gl-js/src/style-spec/reference/v8
 
 // Make temporary modifications here when Native doesn't have all features that JS has.
 delete spec.layout_symbol['symbol-sort-key'];
-delete spec.layout_symbol['symbol-z-order'].values['auto'];
-spec.layout_symbol['symbol-z-order'].default = 'viewport-y';
\ No newline at end of file
diff --git a/src/mbgl/style/layers/symbol_layer_properties.hpp b/src/mbgl/style/layers/symbol_layer_properties.hpp
index cf8a9ab0d..6b6e86fc3 100644
--- a/src/mbgl/style/layers/symbol_layer_properties.hpp
+++ b/src/mbgl/style/layers/symbol_layer_properties.hpp
@@ -29,7 +29,7 @@ struct SymbolAvoidEdges : LayoutProperty<bool> {
 
 struct SymbolZOrder : LayoutProperty<SymbolZOrderType> {
     static constexpr const char *name() { return "symbol-z-order"; }
-    static SymbolZOrderType defaultValue() { return SymbolZOrderType::ViewportY; }
+    static SymbolZOrderType defaultValue() { return SymbolZOrderType::Auto; }
 };
 
 struct IconAllowOverlap : LayoutProperty<bool> {
diff --git a/src/mbgl/style/types.cpp b/src/mbgl/style/types.cpp
index 889f6029e..f388a9385 100644
--- a/src/mbgl/style/types.cpp
+++ b/src/mbgl/style/types.cpp
@@ -78,6 +78,7 @@ MBGL_DEFINE_ENUM(SymbolAnchorType, {
 });
 
 MBGL_DEFINE_ENUM(SymbolZOrderType, {
+    { SymbolZOrderType::Auto, "auto" },
     { SymbolZOrderType::ViewportY, "viewport-y" },
     { SymbolZOrderType::Source, "source" }
 });