For ENG-4904, remove the failure state completely