Backed out changeset 72293b033da5 (bug 842561) for bustage. a=backout