This reverts commit e018ca3e29 from: Simplifying logic for determining disabled status (#6416) Co-authored-by: brunomedeiros-visagio <55057005+brunomedeiros-visagio@users.noreply.github.com>
e018ca3e29