Backed out changeset 9add9f9ed1fd (bug 950266) for m3 failures to help clean up this CLOSED TREE