Backed out changeset 68f02b6be062 (bug 950132)