Revert 8ed661a, which introduced an undeclared variable and broke compilation

I wasn't able to compile on Mavericks with this change, so this pull request reverts it. It seems that there's probably a real fix for this involving tree_, but I can't try and figure it out now. It's probably worth it for someone else to find the real fix.