diff --git a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
index d2836112e932..b4a2f38aa587 100644
--- a/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
+++ b/data/campaigns/tutorial/scenarios/02_Tutorial_part_2.cfg
@@ -1,7 +1,5 @@
#textdomain wesnoth-tutorial
{./utils.cfg}
-# Comment this out for a faster (no-commentry) tutorial for testing.
-{./2_Speaking.cfg}
#define BADGUY TYPE NAME POSITION
[unit]
diff --git a/data/campaigns/tutorial/scenarios/2_Speaking.cfg b/data/campaigns/tutorial/scenarios/2_Speaking.cfg
deleted file mode 100644
index 986fb4449353..000000000000
--- a/data/campaigns/tutorial/scenarios/2_Speaking.cfg
+++ /dev/null
@@ -1,98 +0,0 @@
-#textdomain wesnoth-tutorial
-
-#wmllint: local spelling Galdrad
-
-#define TEACHER MESSAGE_TEXT
- [message]
- speaker=Galdrad
- message={MESSAGE_TEXT}
- [/message]
-#enddef
-
-#define STUDENT MESSAGE_TEXT
- [message]
- speaker=student
- message={MESSAGE_TEXT}
- [/message]
-#enddef
-
-#define NARRATOR CAPTION_TEXT MESSAGE_TEXT
- [message]
- speaker=narrator
- caption={CAPTION_TEXT}
- message={MESSAGE_TEXT}
- image=wesnoth-icon.png
- [/message]
-#enddef
-
-#define UNDO_REMINDER
- [message]
- speaker=narrator
- caption= _"Undo"
- message= _"Don’t forget, you can press u to undo most things; useful for correcting mistakes."
- image=wesnoth-icon.png
- [/message]
- [allow_undo][/allow_undo]
-#enddef
-
-#define TALK_ABOUT ID_STRING MESSAGE_TEXT
- [scroll_to_unit]
- id={ID_STRING}
- [/scroll_to_unit]
-
- [message]
- speaker=Galdrad
- scroll=no
- message={MESSAGE_TEXT}
- [/message]
-#enddef
-
-#define TALK_NO_MOVE MESSAGE_TEXT
- [message]
- speaker=Galdrad
- scroll=no
- message={MESSAGE_TEXT}
- [/message]
-#enddef
-
-#define TALK_ABOUT_LOC POSITION MESSAGE_TEXT
- [scroll_to]
- x,y={POSITION}
- [/scroll_to]
-
- [message]
- speaker=Galdrad
- scroll=no
- message={MESSAGE_TEXT}
- [/message]
-#enddef
-
-#define EXPLAIN_STRONG_INTELLIGENT ID_STRING
- [if]
- [variable]
- name=strongint_explained
- not_equals=done
- [/variable]
- [then]
- #po: This string used as follows: "', your new recruit, has two traits...'"
- # Could be male or female unit? If so, might need gender-specific translations?
- {TEACHER ({ID_STRING} + _", your new recruit, has two traits: strong and intelligent. ‘Strong’ means a unit does more damage, and ‘intelligent’ means it needs less experience to advance a level.")}
- {VARIABLE strongint_explained done}
- [/then]
- [/if]
-#enddef
-
-#define EXPLAIN_QUICK_RESILIENT ID_STRING
- [if]
- [variable]
- name=quickres_explained
- not_equals=done
- [/variable]
- [then]
- #po: This string used as follows: "' has two traits: quick and ...'"
- # Could be male or female unit? If so, might need gender-specific translations?
- {TEACHER ({ID_STRING} + _" has two traits: quick and resilient. ‘Quick’ means a unit can move one tile further each turn, and ‘resilient’ means it has more hitpoints.")}
- {VARIABLE quickres_explained done}
- [/then]
- [/if]
-#enddef
diff --git a/data/campaigns/tutorial/scenarios/utils.cfg b/data/campaigns/tutorial/scenarios/utils.cfg
index 844199744f8f..b07d35cc294f 100644
--- a/data/campaigns/tutorial/scenarios/utils.cfg
+++ b/data/campaigns/tutorial/scenarios/utils.cfg
@@ -110,3 +110,100 @@
[/else]
[/if]
#enddef
+
+#wmllint: local spelling Galdrad
+
+#define TEACHER MESSAGE_TEXT
+ [message]
+ speaker=Galdrad
+ message={MESSAGE_TEXT}
+ [/message]
+#enddef
+
+#define STUDENT MESSAGE_TEXT
+ [message]
+ speaker=student
+ message={MESSAGE_TEXT}
+ [/message]
+#enddef
+
+#define NARRATOR CAPTION_TEXT MESSAGE_TEXT
+ [message]
+ speaker=narrator
+ caption={CAPTION_TEXT}
+ message={MESSAGE_TEXT}
+ image=wesnoth-icon.png
+ [/message]
+#enddef
+
+#define UNDO_REMINDER
+ [message]
+ speaker=narrator
+ caption= _"Undo"
+ message= _"Don’t forget, you can press u to undo most things; useful for correcting mistakes."
+ image=wesnoth-icon.png
+ [/message]
+ [allow_undo][/allow_undo]
+#enddef
+
+#define TALK_ABOUT ID_STRING MESSAGE_TEXT
+ [scroll_to_unit]
+ id={ID_STRING}
+ [/scroll_to_unit]
+
+ [message]
+ speaker=Galdrad
+ scroll=no
+ message={MESSAGE_TEXT}
+ [/message]
+#enddef
+
+#define TALK_NO_MOVE MESSAGE_TEXT
+ [message]
+ speaker=Galdrad
+ scroll=no
+ message={MESSAGE_TEXT}
+ [/message]
+#enddef
+
+#define TALK_ABOUT_LOC POSITION MESSAGE_TEXT
+ [scroll_to]
+ x,y={POSITION}
+ [/scroll_to]
+
+ [message]
+ speaker=Galdrad
+ scroll=no
+ message={MESSAGE_TEXT}
+ [/message]
+#enddef
+
+#define EXPLAIN_STRONG_INTELLIGENT ID_STRING
+ [if]
+ [variable]
+ name=strongint_explained
+ not_equals=done
+ [/variable]
+ [then]
+ #po: This string used as follows: "', your new recruit, has two traits...'"
+ # Could be male or female unit? If so, might need gender-specific translations?
+ {TEACHER ({ID_STRING} + _", your new recruit, has two traits: strong and intelligent. ‘Strong’ means a unit does more damage, and ‘intelligent’ means it needs less experience to advance a level.")}
+ {VARIABLE strongint_explained done}
+ [/then]
+ [/if]
+#enddef
+
+#define EXPLAIN_QUICK_RESILIENT ID_STRING
+ [if]
+ [variable]
+ name=quickres_explained
+ not_equals=done
+ [/variable]
+ [then]
+ #po: This string used as follows: "' has two traits: quick and ...'"
+ # Could be male or female unit? If so, might need gender-specific translations?
+ {TEACHER ({ID_STRING} + _" has two traits: quick and resilient. ‘Quick’ means a unit can move one tile further each turn, and ‘resilient’ means it has more hitpoints.")}
+ {VARIABLE quickres_explained done}
+ [/then]
+ [/if]
+#enddef