Revert "0.25.17 (Nivve) ck2plus holy war changes"

This reverts commit 9f222f1ee0cb56516905c2311d35f3e23f0a8156.