[master] [PATCH] Always honor the 'nokill' flag