Keep backwards compatibility in kill api. Upstream-commit: 4a71323ec3c00be48e3539a1da0444972f22c355 Component: engine