Revert r219223, it creates invalid PHI nodes.