Backed out changeset 45dad11b6580 (bug 1089764) for causing bug 1093067 and bug 1093223.