Backout 409adccbcbd7 (bug 782179)