Backed out changeset 675945ee2609 (bug 986529)