Backed out changeset 8764e9f061d0 (bug 980679) for a smoketest regression a=backout