Normalize after substituting via field.ty()
#89441
+62
−27
Merged
field.ty()
#89441