Backed out changeset b136d95a45b2 (bug 964861) for compilation errors