Backed out changeset cd50c7187a48 (bug 1022821) for compilation errors