Revert "fix CFG NULL successors"

This reverts commit f4e5c0c3f6c06cf88b5bdd4ca94c9eb3ab59e50e.