Removing failsafe - seems to breaking Jenkins