Backed out changeset 2d1fe68319cc (bug 916580) for bustage. a=backout