Ported in old beta self-heal behavior