Revert combat

This reverts commit