TEIID-2339 updating to function more like the old logic