EZP-22146: remove deprecated join causing excessive memory usage