Reverted everything Tree-related