Backed out changesets 1cf7b5810eb5, 4cb373d9ce33, and 6037db66624b (bug 1042436) for bustage.