Backed out changeset df3c1971ecdc (bug 984930)