Revert "simplify unstoppable passer eval (4353881)"

This reverts commit 3032f4d0c95b4b4266ecbb1b5a5b03bc0c321a5a.
fix (3912505)