Backed out changeset a23a23055e13 (bug 863498) for compilation failures on a CLOSED TREE