Bug 1102794 wip