Backed out changeset 38a50c61c285 (bug 931062) for compilation failures on a CLOSED TREE