diff --git a/unsloth/models/rl_replacements.py b/unsloth/models/rl_replacements.py
index fe7f4accee..5ea61cb9b3 100644
--- a/unsloth/models/rl_replacements.py
+++ b/unsloth/models/rl_replacements.py
@@ -90,9 +90,11 @@ def sft_trainer_prepare_dataset(function_name, function):
     "if getattr(tokenizer, 'bos_token', None) is not None else False\n"\
     "if 'add_special_tokens' not in locals() and has_bos_token_already:\n"\
     "    from functools import partial\n"\
-    "    tokenizer = partial(tokenizer, add_special_tokens = False)\n"\
+    "    tokenizer_call = tokenizer.__call__\n"\
+    "    tokenizer.__call__ = partial(tokenizer_call, add_special_tokens = False)\n"\
     "    processing_class = tokenizer\n"\
     "else:\n"\
+    "    tokenizer_call = None\n"\
     "    add_special_tokens = False if has_bos_token_already else locals().get('add_special_tokens', False)\n"
 
     check_text = check_text.split("\n")
@@ -109,6 +111,14 @@ def sft_trainer_prepare_dataset(function_name, function):
         replacer = replacer[0]
         function = function.replace(replacer, replacer + check_text)
     pass
+
+    # Return tokenizer's original state
+    return_state = "if tokenizer_call is not None: tokenizer.__call__ = tokenizer_call\n"
+    function = re.sub(
+        r"\n([ ]{4,})(return .*?[\s]{0,})$",
+        rf"\1{return_state}\1\2",
+        function,
+    )
     return function
 pass
 RL_FUNCTIONS["sft_trainer"].append(sft_trainer_prepare_dataset)
diff --git a/unsloth/tokenizer_utils.py b/unsloth/tokenizer_utils.py
index de9f73d7a5..91bb0202ff 100644
--- a/unsloth/tokenizer_utils.py
+++ b/unsloth/tokenizer_utils.py
@@ -1047,9 +1047,3 @@ pass
 
 # Finally patch TRL tokenizer things -> moved to RL
 # patch_sft_trainer_tokenizer()
-
-# Temporary measure to stop tokenizing data twice
-if hasattr(trl, "data_utils"):
-    def maybe_apply_chat_template(example, *args, **kwargs): return example
-    trl.data_utils.maybe_apply_chat_template = maybe_apply_chat_template
-pass