Backout 0ae42938a72d (bug 1073350) for build bustage, on a CLOSED TREE