Bug 1033964 WIP