Backed out changeset 14f75afaad14 (bug 1095103) for causing bug 1106174.