Backed out changesets 543ea579cedc and 772a61603ce9 (bug 919021) for bustage. a=backout