Backed out changeset f8e2f5c99ede (bug 1061339)