*Backout some WTF fixes. Do things correctly, or do not touch them at all...

*Really fix windows build.

--HG--
branch : trunk

sql/world.sql

@@ -5825,7 +5825,6 @@ INSERT INTO `spell_linked_spell` (`spell_trigger`,`spell_effect`,`type`,`comment
 ( 54850, 54851, 1, 'Emerge - Emerge Summon'),
 -- Trial of the Champion
 ( 66680, 66547, 0, 'Confess - Confess'),
-( 31687, 70907, 0, 'Summon Water Elemental'),
 ( 66889,-66865, 0, 'Remove Vengeance');
 /*!40000 ALTER TABLE `spell_linked_spell` ENABLE KEYS */;
 UNLOCK TABLES;