Backed out changeset fb2062ffc580 (bug 892910) for breaking Windows builds a=backout