Backed out changeset 08df10804c35 (bug 1101974)
Backed out changeset 82e94c16732d (bug 1101974)