Fixes #3
Revert "Merge branch 'kill_list'"

This reverts commit 7f629eeaa463777fcb22c87a67c77396f0b2056b, reversing
changes made to f470a3b3da4b1f87f8f0be36c5c11e7063658c2f.
Merge branch 'kill_list'