bug 1092163 - back out changeset a6240694a609 (bug 1088904) for causing bug 1092163 r=jimm