There still more instances of this check being tripped during behavior
tests that we need to fix before we can enable this.