WIP for Bug 934326