Revert r53606. It turns out that explicitely tracking the liveness of the