WIP for bug 934326