TEIID-3236 narrowing what we mark as optional