Backed out changesets d9cbdfbed1f5 and a38ad201299f (bug 929376) for bustage.