Alternative fix for RT#86592