Backed out changeset c14980a16210 (bug 948265) so it can address review comments first, despite the CLOSED TREE
Automatic merge