Backed out changesets 2d63daf77093 and b9e84eb3785f (bug 984498) for bustage.