TEIID-2462: reverting the changes from perf test