Revert "Patches from Battler and Tom"

This reverts commit 268e4b69f78e6a6a5a85e8be13c7ba8f9ab4bae1.