This partially reverts commit e5343f02. The fatal condition is too strict and is affecting several other scenarios.