Backed out changeset 3ab7869b4c47 for bug 874353