Revert "Changes to attack and defense."

This reverts commit cb0e9affd4b4424467037544649928b833f24e98.