Partial revert from r17154 and r17155.

git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@17156 54d463be-8e91-2dee-dedb-b68131a5f0ec