diff --git a/servo/components/script/dom/element.rs b/servo/components/script/dom/element.rs
index 73eb0d114147e..a6138ac75700c 100644
--- a/servo/components/script/dom/element.rs
+++ b/servo/components/script/dom/element.rs
@@ -5322,11 +5322,6 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 width_value
 .
 clone
@@ -5335,7 +5330,6 @@ clone
 )
 )
 )
-)
 ;
 hints
 .
@@ -5349,11 +5343,6 @@ PropertyDeclaration
 :
 BorderLeftWidth
 (
-Box
-:
-:
-new
-(
 width_value
 .
 clone
@@ -5362,7 +5351,6 @@ clone
 )
 )
 )
-)
 ;
 hints
 .
@@ -5376,11 +5364,6 @@ PropertyDeclaration
 :
 BorderBottomWidth
 (
-Box
-:
-:
-new
-(
 width_value
 .
 clone
@@ -5389,7 +5372,6 @@ clone
 )
 )
 )
-)
 ;
 hints
 .
@@ -5403,16 +5385,10 @@ PropertyDeclaration
 :
 BorderRightWidth
 (
-Box
-:
-:
-new
-(
 width_value
 )
 )
 )
-)
 ;
 }
 }
diff --git a/servo/components/style/properties/longhand/border.mako.rs b/servo/components/style/properties/longhand/border.mako.rs
index d7ff2342bc76c..ab0e75f3680ee 100644
--- a/servo/components/style/properties/longhand/border.mako.rs
+++ b/servo/components/style/properties/longhand/border.mako.rs
@@ -459,11 +459,6 @@ side
 -
 width
 "
-boxed
-=
-"
-True
-"
 animation_type
 =
 "
diff --git a/servo/components/style/properties/longhand/box.mako.rs b/servo/components/style/properties/longhand/box.mako.rs
index f676c2dd89d8a..ae3fefe9e6ac9 100644
--- a/servo/components/style/properties/longhand/box.mako.rs
+++ b/servo/components/style/properties/longhand/box.mako.rs
@@ -15578,9 +15578,6 @@ extra_prefixes
 moz
 webkit
 "
-boxed
-=
-True
 creates_stacking_context
 =
 True
diff --git a/servo/components/style/properties/longhand/column.mako.rs b/servo/components/style/properties/longhand/column.mako.rs
index 4a2d91dc46f6a..80d5190d1463b 100644
--- a/servo/components/style/properties/longhand/column.mako.rs
+++ b/servo/components/style/properties/longhand/column.mako.rs
@@ -147,9 +147,6 @@ extra_prefixes
 "
 moz
 "
-boxed
-=
-True
 animation_type
 =
 "
@@ -321,9 +318,6 @@ moz
 experimental
 =
 True
-boxed
-=
-True
 animation_type
 =
 "
@@ -455,11 +449,6 @@ products
 "
 gecko
 "
-boxed
-=
-"
-True
-"
 animation_type
 =
 "
diff --git a/servo/components/style/properties/longhand/inherited_text.mako.rs b/servo/components/style/properties/longhand/inherited_text.mako.rs
index f248f65382ba6..b4c328b54e4bb 100644
--- a/servo/components/style/properties/longhand/inherited_text.mako.rs
+++ b/servo/components/style/properties/longhand/inherited_text.mako.rs
@@ -3323,11 +3323,6 @@ letter
 -
 spacing
 "
-boxed
-=
-"
-True
-"
 animation_type
 =
 "
@@ -9147,9 +9142,6 @@ products
 "
 gecko
 "
-boxed
-=
-True
 animation_type
 =
 "
@@ -9371,11 +9363,6 @@ stroke
 -
 width
 "
-boxed
-=
-"
-True
-"
 animation_type
 =
 "
diff --git a/servo/components/style/values/computed/length.rs b/servo/components/style/values/computed/length.rs
index 7954abedf135a..53d8d3a3235c1 100644
--- a/servo/components/style/values/computed/length.rs
+++ b/servo/components/style/values/computed/length.rs
@@ -411,9 +411,9 @@ Length
 :
 Calc
 (
+range
 ref
 calc
-range
 )
 =
 >
diff --git a/servo/components/style/values/specified/length.rs b/servo/components/style/values/specified/length.rs
index df8152357db49..ba270ae5ed9ff 100644
--- a/servo/components/style/values/specified/length.rs
+++ b/servo/components/style/values/specified/length.rs
@@ -3921,11 +3921,11 @@ calc
 notation
 Calc
 (
+AllowedLengthType
 Box
 <
 CalcLengthOrPercentage
 >
-AllowedLengthType
 )
 }
 impl
@@ -3999,9 +3999,9 @@ Length
 :
 Calc
 (
+_
 ref
 calc
-_
 )
 =
 >
@@ -4071,9 +4071,9 @@ Length
 :
 Calc
 (
+_
 ref
 calc
-_
 )
 =
 >
@@ -6591,6 +6591,7 @@ Length
 :
 Calc
 (
+num_context
 Box
 :
 :
@@ -6598,7 +6599,6 @@ new
 (
 calc
 )
-num_context
 )
 }
 )
@@ -8516,8 +8516,8 @@ Length
 :
 Calc
 (
-l
 _
+l
 )
 =
 >
diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs
index cac4000025fd5..89883b6781b3d 100644
--- a/servo/ports/geckolib/glue.rs
+++ b/servo/ports/geckolib/glue.rs
@@ -11069,11 +11069,6 @@ into
 BorderTopWidth
 =
 >
-Box
-:
-:
-new
-(
 BorderWidth
 :
 :
@@ -11085,15 +11080,9 @@ into
 (
 )
 )
-)
 BorderRightWidth
 =
 >
-Box
-:
-:
-new
-(
 BorderWidth
 :
 :
@@ -11105,15 +11094,9 @@ into
 (
 )
 )
-)
 BorderBottomWidth
 =
 >
-Box
-:
-:
-new
-(
 BorderWidth
 :
 :
@@ -11125,15 +11108,9 @@ into
 (
 )
 )
-)
 BorderLeftWidth
 =
 >
-Box
-:
-:
-new
-(
 BorderWidth
 :
 :
@@ -11145,7 +11122,6 @@ into
 (
 )
 )
-)
 MarginTop
 =
 >
diff --git a/servo/rust-commit-hash b/servo/rust-commit-hash
index c7e14fa626887..978afb0be45f8 100644
--- a/servo/rust-commit-hash
+++ b/servo/rust-commit-hash
@@ -1 +1 @@
-474f7a91eec8cba83b7eb7a578a7adb70614f877
+5f13a3b540ab6024665322d716e487c800645f24
diff --git a/servo/tests/unit/style/properties/serialization.rs b/servo/tests/unit/style/properties/serialization.rs
index a36402e056786..37fd8636f338b 100644
--- a/servo/tests/unit/style/properties/serialization.rs
+++ b/servo/tests/unit/style/properties/serialization.rs
@@ -1754,11 +1754,6 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 px_30
 .
 clone
@@ -1766,7 +1761,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -1777,11 +1771,6 @@ PropertyDeclaration
 :
 BorderRightWidth
 (
-Box
-:
-:
-new
-(
 px_30
 .
 clone
@@ -1789,7 +1778,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -1800,11 +1788,6 @@ PropertyDeclaration
 :
 BorderBottomWidth
 (
-Box
-:
-:
-new
-(
 px_30
 .
 clone
@@ -1812,7 +1795,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -1823,11 +1805,6 @@ PropertyDeclaration
 :
 BorderLeftWidth
 (
-Box
-:
-:
-new
-(
 px_10
 .
 clone
@@ -1835,7 +1812,6 @@ clone
 )
 )
 )
-)
 ;
 let
 blue
@@ -2098,11 +2074,6 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 px_30
 .
 clone
@@ -2110,7 +2081,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -2121,11 +2091,6 @@ PropertyDeclaration
 :
 BorderRightWidth
 (
-Box
-:
-:
-new
-(
 px_30
 .
 clone
@@ -2133,7 +2098,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -2144,11 +2108,6 @@ PropertyDeclaration
 :
 BorderBottomWidth
 (
-Box
-:
-:
-new
-(
 px_30
 .
 clone
@@ -2156,7 +2115,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -2167,11 +2125,6 @@ PropertyDeclaration
 :
 BorderLeftWidth
 (
-Box
-:
-:
-new
-(
 px_30
 .
 clone
@@ -2179,7 +2132,6 @@ clone
 )
 )
 )
-)
 ;
 let
 blue
@@ -2538,15 +2490,9 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 top_px
 )
 )
-)
 ;
 properties
 .
@@ -2557,15 +2503,9 @@ PropertyDeclaration
 :
 BorderRightWidth
 (
-Box
-:
-:
-new
-(
 right_px
 )
 )
-)
 ;
 properties
 .
@@ -2576,15 +2516,9 @@ PropertyDeclaration
 :
 BorderBottomWidth
 (
-Box
-:
-:
-new
-(
 bottom_px
 )
 )
-)
 ;
 properties
 .
@@ -2595,15 +2529,9 @@ PropertyDeclaration
 :
 BorderLeftWidth
 (
-Box
-:
-:
-new
-(
 left_px
 )
 )
-)
 ;
 let
 serialization
@@ -2699,15 +2627,9 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 top_px
 )
 )
-)
 ;
 properties
 .
@@ -2718,15 +2640,9 @@ PropertyDeclaration
 :
 BorderRightWidth
 (
-Box
-:
-:
-new
-(
 right_px
 )
 )
-)
 ;
 properties
 .
@@ -2737,15 +2653,9 @@ PropertyDeclaration
 :
 BorderBottomWidth
 (
-Box
-:
-:
-new
-(
 bottom_px
 )
 )
-)
 ;
 properties
 .
@@ -2756,15 +2666,9 @@ PropertyDeclaration
 :
 BorderLeftWidth
 (
-Box
-:
-:
-new
-(
 left_px
 )
 )
-)
 ;
 let
 serialization
@@ -3489,15 +3393,9 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 width
 )
 )
-)
 ;
 properties
 .
@@ -3633,15 +3531,9 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 width
 )
 )
-)
 ;
 properties
 .
@@ -3733,15 +3625,9 @@ PropertyDeclaration
 :
 BorderRightWidth
 (
-Box
-:
-:
-new
-(
 width
 )
 )
-)
 ;
 properties
 .
@@ -3833,15 +3719,9 @@ PropertyDeclaration
 :
 BorderBottomWidth
 (
-Box
-:
-:
-new
-(
 width
 )
 )
-)
 ;
 properties
 .
@@ -3933,15 +3813,9 @@ PropertyDeclaration
 :
 BorderLeftWidth
 (
-Box
-:
-:
-new
-(
 width
 )
 )
-)
 ;
 properties
 .
@@ -4033,11 +3907,6 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 width
 .
 clone
@@ -4045,7 +3914,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -4090,11 +3958,6 @@ PropertyDeclaration
 :
 BorderRightWidth
 (
-Box
-:
-:
-new
-(
 width
 .
 clone
@@ -4102,7 +3965,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -4147,11 +4009,6 @@ PropertyDeclaration
 :
 BorderBottomWidth
 (
-Box
-:
-:
-new
-(
 width
 .
 clone
@@ -4159,7 +4016,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -4204,11 +4060,6 @@ PropertyDeclaration
 :
 BorderLeftWidth
 (
-Box
-:
-:
-new
-(
 width
 .
 clone
@@ -4216,7 +4067,6 @@ clone
 )
 )
 )
-)
 ;
 properties
 .
@@ -4852,15 +4702,9 @@ PropertyDeclaration
 :
 ColumnWidth
 (
-Box
-:
-:
-new
-(
 width
 )
 )
-)
 ;
 properties
 .
diff --git a/servo/tests/unit/style/properties/viewport.rs b/servo/tests/unit/style/properties/viewport.rs
index ac15064593890..b0b8668a1f558 100644
--- a/servo/tests/unit/style/properties/viewport.rs
+++ b/servo/tests/unit/style/properties/viewport.rs
@@ -138,11 +138,6 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 border_top_width
 :
 :
@@ -173,7 +168,6 @@ Vw
 )
 )
 )
-)
 ;
 assert
 !
@@ -193,11 +187,6 @@ PropertyDeclaration
 :
 BorderTopWidth
 (
-Box
-:
-:
-new
-(
 border_top_width
 :
 :
@@ -234,7 +223,6 @@ to_f32_px
 )
 )
 )
-)
 ;
 assert
 !