Backed out changesets e8884fea6e4f and 3290a0450c8e (bug 858101) for bustage on a CLOSED TREE. a=backout