Comment 15 for bug 420354

I've got a branch in progress that fixes the base issue, but breaks in other ways (so it needs more work). The work has suffered from delays due to other (scalability) work being even more critical than this.