Backed out changeset 84663a25b44e (bug 976260) for compilation failures