Revert part of new combat system.
Revert the rest of combat system changes.