Revert:  Long-press to kill-on by default