Combat Ripley
Revert "Combat Ripley"

This reverts commit ab4247e08113dff550c39e2e37f7dfe30e9d4066.