Backed out changeset eb34b68e2f2a (bug 820716) for causing perma-orange testfailure