diff --git a/data/sql/updates/pending_db_world/rev_1719165910236885300.sql b/data/sql/updates/pending_db_world/rev_1719165910236885300.sql
new file mode 100644
index 000000000..481276d1d
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1719165910236885300.sql
@@ -0,0 +1,12 @@
+-- Horvon the Armorer, Greatfather Aldrimus
+DELETE FROM `creature_template_addon` WHERE `entry` IN (19879,19698);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(19879, 0, 0, 0, 1, 0, 0, '32648'),
+(19698, 0, 0, 8, 1, 0, 0, '32648');
+
+UPDATE `creature_template` SET `ScriptName` = '' WHERE (`entry` = 19698);
+
+DELETE FROM `spell_area` WHERE `spell`=32649 AND `area`=3688;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`, `quest_start_status`, `quest_end_status`) VALUES
+(32649, 3688, 10045, 0, 0, 0, 2, 1, 64, 11),
+(32649, 3688, 10252, 0, 0, 0, 2, 1, 64, 11);
diff --git a/src/server/scripts/Outland/zone_terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp
index 86dc4cd35..69a71534b 100644
--- a/src/server/scripts/Outland/zone_terokkar_forest.cpp
+++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp
@@ -114,27 +114,6 @@ class spell_q10929_fumping_aura : public AuraScript
     }
 };
 
-class npc_greatfather_aldrimus : public CreatureScript
-{
-public:
-    npc_greatfather_aldrimus() : CreatureScript("npc_greatfather_aldrimus") { }
-
-    CreatureAI* GetAI(Creature* creature) const override
-    {
-        return new npc_greatfather_aldrimusAI(creature);
-    }
-
-    struct npc_greatfather_aldrimusAI : public ScriptedAI
-    {
-        npc_greatfather_aldrimusAI(Creature* c) : ScriptedAI(c) {}
-
-        bool CanBeSeen(Player const* player) override
-        {
-            return player->GetQuestStatus(10253) == QUEST_STATUS_REWARDED;
-        }
-    };
-};
-
 enum q10036Torgos
 {
     NPC_TORGOS                  = 18707
@@ -636,7 +615,6 @@ void AddSC_terokkar_forest()
     // Ours
     RegisterSpellAndAuraScriptPair(spell_q10930_big_bone_worm, spell_q10930_big_bone_worm_aura);
     RegisterSpellAndAuraScriptPair(spell_q10929_fumping, spell_q10929_fumping_aura);
-    new npc_greatfather_aldrimus();
     RegisterSpellScript(spell_q10036_torgos);
     RegisterSpellScript(spell_q10923_evil_draws_near_summon);
     RegisterSpellScript(spell_q10923_evil_draws_near_periodic_aura);