Disable kill_states by default on upgrade, it fixes #3183