diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs
index 4ef45a502bc..c408bfe11e9 100644
--- a/components/style/properties/longhands/box.mako.rs
+++ b/components/style/properties/longhands/box.mako.rs
@@ -513,14 +513,16 @@ ${helpers.predefined_type(
     servo_restyle_damage="reflow_out_of_flow"
 )}
 
-${helpers.predefined_type("contain",
-                          "Contain",
-                          "specified::Contain::empty()",
-                          animation_value_type="discrete",
-                          products="gecko",
-                          flags="CREATES_STACKING_CONTEXT FIXPOS_CB",
-                          gecko_pref="layout.css.contain.enabled",
-                          spec="https://drafts.csswg.org/css-contain/#contain-property")}
+${helpers.predefined_type(
+    "contain",
+    "Contain",
+    "specified::Contain::empty()",
+    animation_value_type="none",
+    products="gecko",
+    flags="CREATES_STACKING_CONTEXT FIXPOS_CB",
+    gecko_pref="layout.css.contain.enabled",
+    spec="https://drafts.csswg.org/css-contain/#contain-property",
+)}
 
 // Non-standard
 ${helpers.predefined_type(
@@ -552,7 +554,7 @@ ${helpers.predefined_type(
     "WillChange",
     "computed::WillChange::auto()",
     products="gecko",
-    animation_value_type="discrete",
+    animation_value_type="none",
     spec="https://drafts.csswg.org/css-will-change/#will-change"
 )}
 
diff --git a/components/style/properties/longhands/inherited_box.mako.rs b/components/style/properties/longhands/inherited_box.mako.rs
index 4482931fd7a..d810ec3d29a 100644
--- a/components/style/properties/longhands/inherited_box.mako.rs
+++ b/components/style/properties/longhands/inherited_box.mako.rs
@@ -40,15 +40,12 @@ ${helpers.single_keyword(
     servo_restyle_damage="rebuild_and_reflow",
 )}
 
-// TODO(emilio): Should text-orientation be non-animatable? It affects the
-// WritingMode value, but not the logical -> physical mapping of properties,
-// which is the reason direction / writing-mode are non-animatable.
 ${helpers.single_keyword(
     "text-orientation",
     "mixed upright sideways",
     extra_gecko_aliases="sideways-right=sideways",
     products="gecko",
-    animation_value_type="discrete",
+    animation_value_type="none",
     spec="https://drafts.csswg.org/css-writing-modes/#propdef-text-orientation",
 )}
 
diff --git a/components/style/properties/longhands/text.mako.rs b/components/style/properties/longhands/text.mako.rs
index 613ed6c5f67..f87fe4915a3 100644
--- a/components/style/properties/longhands/text.mako.rs
+++ b/components/style/properties/longhands/text.mako.rs
@@ -21,11 +21,13 @@ ${helpers.predefined_type("text-overflow",
                           spec="https://drafts.csswg.org/css-ui/#propdef-text-overflow",
                           servo_restyle_damage="rebuild_and_reflow")}
 
-${helpers.single_keyword("unicode-bidi",
-                         "normal embed isolate bidi-override isolate-override plaintext",
-                         animation_value_type="discrete",
-                         spec="https://drafts.csswg.org/css-writing-modes/#propdef-unicode-bidi",
-                         servo_restyle_damage="rebuild_and_reflow")}
+${helpers.single_keyword(
+    "unicode-bidi",
+    "normal embed isolate bidi-override isolate-override plaintext",
+    animation_value_type="none",
+    spec="https://drafts.csswg.org/css-writing-modes/#propdef-unicode-bidi",
+    servo_restyle_damage="rebuild_and_reflow",
+)}
 
 ${helpers.predefined_type("text-decoration-line",
                           "TextDecorationLine",