Backout 342c2b349402, bug 803192