Backed out changeset 028f5d36f9cc (bug 823559 relanding). a=breakage