Backed out changeset 5d63a1316981 (bug 1024288)
Backed out changeset 7b4feb3d3a39 (bug 1024288) for compilation errors; CLOSED TREE