diff --git a/data/text.js b/data/text.js
index d76ff5358..5b318bf7a 100644
--- a/data/text.js
+++ b/data/text.js
@@ -205,7 +205,6 @@ var BattleText = exports.BattleText = {
 	sandstorm: {
 		weatherName: "Sandstorm",
 		start: "  A sandstorm kicked up!",
-		startFromAbility: "  [POKEMON]'s Sand Stream whipped up a sandstorm!",
 		end: "  The sandstorm subsided.",
 		activate: "  The sandstorm is raging.",
 		damage: "  [POKEMON] is buffeted by the sandstorm!",
@@ -213,21 +212,18 @@ var BattleText = exports.BattleText = {
 	sunnyday: {
 		weatherName: "Sun",
 		start: "  The sunlight turned harsh!",
-		startFromAbility: "  [POKEMON]'s Drought intensified the sun's rays!",
 		end: "  The sunlight faded.",
 		activate: "  (The sunlight is strong!)",
 	},
 	raindance: {
 		weatherName: "Rain",
 		start: "  It started to rain!",
-		startFromAbility: "  [POKEMON]'s Drizzle made it rain!",
 		end: "  The rain stopped.",
 		activate: "  (Rain continues to fall!)",
 	},
 	hail: {
 		weatherName: "Hail",
 		start: "  It started to hail!",
-		startFromAbility: "  [POKEMON]'s Snow Warning whipped up a hailstorm!",
 		end: "  The hail stopped.",
 		activate: "  The hail is crashing down.",
 		damage: "  [POKEMON] is buffeted by the hail!",
diff --git a/src/battle-text-parser.ts b/src/battle-text-parser.ts
index c4dea5988..b61d5daa1 100644
--- a/src/battle-text-parser.ts
+++ b/src/battle-text-parser.ts
@@ -536,18 +536,15 @@ class BattleTextParser {
 
 		case '-weather': {
 			const [, weather] = args;
-			const line1 = this.maybeAbility(kwArgs.from, kwArgs.of);
 			if (!weather || weather === 'none') {
 				return this.template('end', kwArgs.from);
 			}
 			if (kwArgs.upkeep) {
 				return this.template('activate', weather);
 			}
-			if (!kwArgs.of) {
-				return this.template('start', weather);
-			}
-			const template = this.template('startFromAbility', weather);
-			return line1 + template.replace('[POKEMON]', this.pokemon(kwArgs.of));
+			const line1 = this.maybeAbility(kwArgs.from, kwArgs.of);
+			const template = this.template('start', weather, 'NODEFAULT');
+			return line1 + template;
 		}
 
 		case '-fieldstart': case '-fieldactivate': {