Backed out changeset 36d9f1b26ac2 (bug 1038854)