bring in bugfix for RT#415788