Backed out changeset 97e18fbba4b6 (bug 965309)
Backed out changeset 67652107c498 (bug 965309)