Revert "Patch from Battler."

This reverts commit d1c3c642be389f9ef9241a4c1501ae237ede1f72.