Backed out changeset fe104053f4f2 (bug 861039) for compilation failures