Revert fixing kill bug