Avoid unnecessary relabeling of killed state
Merge pull request #4236 from mmascher/master

Avoid unnecessary relabeling of killed state