Backed out changeset 5a4fe79c370f (bug 958980) for bustage. a=backout