Revert "Fixes in failsafe detection"

This reverts commit bc7062f34af3414e103553d027fc4d193124c7a2.