Revert "Better handling of phantom crash"

This reverts commit c1aa6dab048670ef7c60f76f8c1554e208c07fb7.