Fix bad cherry-pick of liveness change.