diff --git a/third_party/geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp b/third_party/geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp
index 20d2ddf6b..91354442e 100644
--- a/third_party/geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp
+++ b/third_party/geometry.hpp-0.9.2/include/mapbox/geometry/feature.hpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>
 #include <unordered_map>
-#include <experimental/optional>
+#include <mapbox/optional.hpp>
 
 namespace mapbox {
 namespace geometry {
@@ -54,13 +54,13 @@ struct feature
 
     geometry_type geometry;
     property_map properties {};
-    std::experimental::optional<identifier> id {};
+    mapbox::util::optional<identifier> id {};
 
     // GCC 4.9 does not support C++14 aggregates with non-static data member
     // initializers.
     feature(geometry_type geometry_,
             property_map properties_ = property_map {},
-            std::experimental::optional<identifier> id_ = std::experimental::optional<identifier> {})
+            mapbox::util::optional<identifier> id_ = mapbox::util::optional<identifier> {})
         : geometry(std::move(geometry_)),
           properties(std::move(properties_)),
           id(std::move(id_)) {}