Backed out 2 changesets (bug 829858, bug 761040) for build bustage. a=backout