Bug 877849, WIP