Backed out changesets b6a83f3f6215 and d1eafa349050 (bug 858101) for bustage on a CLOSED TREE. a=backout DONTBUILD