This reverts commit 7f0de957. This is missing handling for !isReachableFromEntry() blocks, which may be relevant for some callers. Revert for now.