Revert "tuna: switch to my build tree"

This reverts commit 4d6abd34ce4452f735438003a97bac8294d23c19.