Backed out changeset dade62440f97 (bug 1044020)
Backed out changeset 49b1465d3e5e (bug 1044020) for compilation failures