Backed out changeset 2e76e3b9479e (bug 913224) for compilation errors