Revert "beating pidkiller into shape"

Yeah, this wasn't such a good idea,  reverting.

This reverts commit 3e31f86cccbefd48f0d79bcfeb4130c6db444751.