Revert "Add temporary hack!"

This reverts commit 5121a1f76d3b758bc81be9d6ccc6a43e2c20f550.
Fix statefullness bug in check_liveness