Is this necessary, other than to clutter history? It's a revert of 9c446474 and 18a857ad to replace them with part of rathena/rathena@711e5009 (which in turn was a merge from Hercules)