diff --git a/core/src/display_object/edit_text.rs b/core/src/display_object/edit_text.rs
index e608c97a84d0..9c1ffb192617 100644
--- a/core/src/display_object/edit_text.rs
+++ b/core/src/display_object/edit_text.rs
@@ -656,7 +656,7 @@ impl<'gc> EditText<'gc> {
         self.0
             .write(context.gc_context)
             .text_spans
-            .replace_text(from, to, text, None);
+            .replace_text(from, to, text);
         self.relayout(context);
     }
 
diff --git a/core/src/html/test.rs b/core/src/html/test.rs
index d21f3a665a65..e38aec57eb9d 100644
--- a/core/src/html/test.rs
+++ b/core/src/html/test.rs
@@ -775,7 +775,7 @@ fn formatspans_replace_text_inbounds() {
         ],
     );
 
-    fs.replace_text(3, 6, WStr::from_units(b"123"), None);
+    fs.replace_text(3, 6, WStr::from_units(b"123"));
 
     assert_eq!(WStr::from_units(b"abc123ghi"), fs.text());
 
@@ -803,7 +803,7 @@ fn formatspans_replace_text_edgebounds() {
         ],
     );
 
-    fs.replace_text(8, 35, WStr::from_units(b"123"), None);
+    fs.replace_text(8, 35, WStr::from_units(b"123"));
 
     assert_eq!(WStr::from_units(b"abcdefgh123"), fs.text());
 
@@ -832,7 +832,7 @@ fn formatspans_replace_text_oob() {
         ],
     );
 
-    fs.replace_text(24, 35, WStr::from_units(b"123"), None);
+    fs.replace_text(24, 35, WStr::from_units(b"123"));
 
     assert_eq!(WStr::from_units(b"abcdefghi123"), fs.text());
 
@@ -861,7 +861,7 @@ fn formatspans_replace_text_degenerate() {
         ],
     );
 
-    fs.replace_text(52, 35, WStr::from_units(b"123"), None);
+    fs.replace_text(52, 35, WStr::from_units(b"123"));
 
     assert_eq!(WStr::from_units(b"abcdefghi"), fs.text());
 
diff --git a/core/src/html/text_format.rs b/core/src/html/text_format.rs
index 781735e7ae4a..072f1e9c42d9 100644
--- a/core/src/html/text_format.rs
+++ b/core/src/html/text_format.rs
@@ -1109,7 +1109,7 @@ impl FormatSpans {
     /// exact text range, you must first call `ensure_span_break_at` for both
     /// `from` and `to`.
     ///
-    /// The indexes returned from this function is not valid across calls which
+    /// The indexes returned from this function are not valid across calls which
     /// mutate spans.
     pub fn get_span_boundaries(&self, from: usize, to: usize) -> (usize, usize) {
         let start_pos = self.resolve_position_as_span(from).unwrap_or((0, 0)).0;
@@ -1152,7 +1152,7 @@ impl FormatSpans {
         }
         for &(from, to) in to_remove.iter().rev() {
             if from != to {
-                self.replace_text(from, to, WStr::empty(), None);
+                self.replace_text(from, to, WStr::empty());
             }
         }
     }
@@ -1300,13 +1300,7 @@ impl FormatSpans {
     ///
     /// (The text formatting behavior has been confirmed by manual testing with
     /// Flash Player 8.)
-    pub fn replace_text(
-        &mut self,
-        from: usize,
-        to: usize,
-        with: &WStr,
-        new_tf: Option<&TextFormat>,
-    ) {
+    pub fn replace_text(&mut self, from: usize, to: usize, with: &WStr) {
         if to < from {
             return;
         }
@@ -1316,20 +1310,20 @@ impl FormatSpans {
             self.ensure_span_break_at(to);
 
             let (start_pos, end_pos) = self.get_span_boundaries(from, to);
-            let new_tf = new_tf
-                .cloned()
-                .or_else(|| self.spans.get(end_pos).map(|span| span.get_text_format()))
-                .unwrap_or_else(|| self.default_format.clone());
+            let new_tf = self.spans.get(end_pos).map(|span| span.get_text_format());
 
             self.spans.drain(start_pos..end_pos);
             self.spans.insert(
                 start_pos,
-                TextSpan::with_length_and_format(with.len(), &new_tf),
+                TextSpan::with_length_and_format(
+                    with.len(),
+                    new_tf.as_ref().unwrap_or(&self.default_format),
+                ),
             );
         } else {
             self.spans.push(TextSpan::with_length_and_format(
                 with.len(),
-                new_tf.unwrap_or(&self.default_format),
+                &self.default_format,
             ));
         }