Backed out changeset 8f9821730b2c, changeset 7ad08f5284e9 (bug 964421) for gtest failures on a CLOSED TREE a=backout