Boris Gudenuf
Deity
I have definitely complained more than once that it either needs to be removed or made super restricted to either 1) conquered cities or 2) cities with loyalty/amenity issues. Not random modern armors popping up in my most loyal, happy, and developed core cities. Luckily it happens less than it used to.
Actually, this might be a way to address another annoyance in the game: make Partisan Recruitment more likely or even automatic Partisan Spawn a feature of 'conquered' City States. If you or the AI insist on gobbling up City States like candy, you should have a good chance of choking on them . . .