Backed out changesets 6d88fc08e25a (bug 829858) and 7a7bb804aeda (bug 761040) for build bustage. a=backout