Backed out changeset dcec4c42cd18 (bug 757866) for bug 980835