1 files changed, 6 insertions, 2 deletions
diff --git a/include/mbgl/style/conversion/property_value.hpp b/include/mbgl/style/conversion/property_value.hpp
index 2256cfffb4..db23074c5e 100644
--- a/include/mbgl/style/conversion/property_value.hpp
+++ b/include/mbgl/style/conversion/property_value.hpp
@@ -16,9 +16,13 @@ namespace conversion {
 
 template <class T>
 struct Converter<PropertyValue<T>> {
-    optional<PropertyValue<T>> operator()(const Convertible& value, Error& error) const {
+    optional<PropertyValue<T>> operator()(const Convertible& value, Error& error, bool convertTokens = false) const {
         using namespace mbgl::style::expression;
 
+        // Only icon-image and text-field support tokens, and they are both data-driven.
+        assert(!convertTokens);
+        (void)convertTokens;
+
         if (isUndefined(value)) {
             return PropertyValue<T>();
         }
@@ -34,7 +38,7 @@ struct Converter<PropertyValue<T>> {
             }
             expression = PropertyExpression<T>(std::move(*parsed));
         } else if (isObject(value)) {
-            expression = convertFunctionToExpression<T>(value, error);
+            expression = convertFunctionToExpression<T>(value, error, false);
         } else {
             optional<T> constant = convert<T>(value, error);
             if (!constant) {