Don't killall self during 'kill' (allow multi-invocations)
Temporary commit for this weekend's powercut